[Lldb-commits] [lldb] r252993 - gtest - Make a `PythonTestSuite` base class for setup / teardown.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Thu Nov 12 19:24:35 2015
New Revision: 252993

URL: http://llvm.org/viewvc/llvm-project?rev=252993&view=rev
Log:
gtest - Make a `PythonTestSuite` base class for setup / teardown.

This allows other potential unit test suites (of which one is
forthcoming in a subsequent patch) to re-use the same initialization
and teardown of the GIL.

Added:
    lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp
    lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.h
Modified:
    lldb/trunk/unittests/ScriptInterpreter/Python/CMakeLists.txt
    lldb/trunk/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp

Modified: lldb/trunk/unittests/ScriptInterpreter/Python/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/ScriptInterpreter/Python/CMakeLists.txt?rev=252993&r1=252992&r2=252993&view=diff
==============================================================================
--- lldb/trunk/unittests/ScriptInterpreter/Python/CMakeLists.txt (original)
+++ lldb/trunk/unittests/ScriptInterpreter/Python/CMakeLists.txt Thu Nov 12 19:24:35 2015
@@ -1,5 +1,6 @@
 add_lldb_unittest(ScriptInterpreterPythonTests
   PythonDataObjectsTests.cpp
+  PythonTestSuite.cpp
   )
 
   target_link_libraries(ScriptInterpreterPythonTests lldbPluginScriptInterpreterPython ${PYTHON_LIBRARY})

Modified: lldb/trunk/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp?rev=252993&r1=252992&r2=252993&view=diff
==============================================================================
--- lldb/trunk/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp (original)
+++ lldb/trunk/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp Thu Nov 12 19:24:35 2015
@@ -16,25 +16,17 @@
 #include "Plugins/ScriptInterpreter/Python/PythonDataObjects.h"
 #include "Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h"
 
+#include "PythonTestSuite.h"
+
 using namespace lldb_private;
 
-class PythonDataObjectsTest : public testing::Test
+class PythonDataObjectsTest : public PythonTestSuite
 {
   public:
     void
     SetUp() override
     {
-        HostInfoBase::Initialize();
-        // ScriptInterpreterPython::Initialize() depends on HostInfo being
-        // initializedso it can compute the python directory etc.
-        ScriptInterpreterPython::Initialize();
-
-        // Although we don't care about concurrency for the purposes of running
-        // this test suite, Python requires the GIL to be locked even for
-        // deallocating memory, which can happen when you call Py_DECREF or
-        // Py_INCREF.  So acquire the GIL for the entire duration of this
-        // test suite.
-        m_gil_state = PyGILState_Ensure();
+        PythonTestSuite::SetUp();
 
         PythonString sys_module("sys");
         m_sys_module.Reset(PyRefType::Owned, PyImport_Import(sys_module.get()));
@@ -48,18 +40,14 @@ class PythonDataObjectsTest : public tes
         m_sys_module.Reset();
         m_main_module.Reset();
         m_builtins_module.Reset();
-        PyGILState_Release(m_gil_state);
 
-        ScriptInterpreterPython::Terminate();
+        PythonTestSuite::TearDown();
     }
 
   protected:
     PythonModule m_sys_module;
     PythonModule m_main_module;
     PythonModule m_builtins_module;
-
-  private:
-    PyGILState_STATE m_gil_state;
 };
 
 TEST_F(PythonDataObjectsTest, TestOwnedReferences)

Added: lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp?rev=252993&view=auto
==============================================================================
--- lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp (added)
+++ lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp Thu Nov 12 19:24:35 2015
@@ -0,0 +1,42 @@
+//===-- PythonTestSuite.cpp -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "gtest/gtest.h"
+
+#include "lldb/Host/HostInfo.h"
+#include "Plugins/ScriptInterpreter/Python/lldb-python.h"
+#include "Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h"
+
+#include "PythonTestSuite.h"
+
+using namespace lldb_private;
+
+void
+PythonTestSuite::SetUp()
+{
+    HostInfoBase::Initialize();
+    // ScriptInterpreterPython::Initialize() depends on HostInfo being
+    // initializedso it can compute the python directory etc.
+    ScriptInterpreterPython::Initialize();
+
+    // Although we don't care about concurrency for the purposes of running
+    // this test suite, Python requires the GIL to be locked even for
+    // deallocating memory, which can happen when you call Py_DECREF or
+    // Py_INCREF.  So acquire the GIL for the entire duration of this
+    // test suite.
+    m_gil_state = PyGILState_Ensure();
+}
+
+void
+PythonTestSuite::TearDown()
+{
+    PyGILState_Release(m_gil_state);
+
+    ScriptInterpreterPython::Terminate();
+}

Added: lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.h?rev=252993&view=auto
==============================================================================
--- lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.h (added)
+++ lldb/trunk/unittests/ScriptInterpreter/Python/PythonTestSuite.h Thu Nov 12 19:24:35 2015
@@ -0,0 +1,26 @@
+//===-- PythonTestSuite.cpp -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "gtest/gtest.h"
+
+using namespace lldb_private;
+
+class PythonTestSuite : public testing::Test
+{
+public:
+    void
+    SetUp() override;
+
+    void
+    TearDown() override;
+
+private:
+    PyGILState_STATE m_gil_state;
+};
+