Merge dwarf and dsym tests

Currently most of the test files have a separate dwarf and a separate
dsym test with almost identical content (only the build step is
different). With adding dwo symbol file handling to the test suit it
would increase this to a 3-way duplication. The purpose of this change
is to eliminate this redundancy with generating 2 test case (one dwarf
and one dsym) for each test function specified (dwo handling will be
added at a later commit).

Main design goals:
* There should be no boilerplate code in each test file to support the
  multiple debug info in most of the tests (custom scenarios are
  acceptable in special cases) so adding a new test case is easier and
  we can't miss one of the debug info type.
* In case of a test failure, the debug symbols used during the test run
  have to be cleanly visible from the output of dotest.py to make
  debugging easier both from build bot logs and from local test runs
* Each test case should have a unique, fully qualified name so we can
  run exactly 1 test with "-f <test-case>.<test-function>" syntax
* Test output should be grouped based on test files the same way as it
  happens now (displaying dwarf/dsym results separately isn't
  preferable)

Proposed solution (main logic in lldbtest.py, rest of them are test
cases fixed up for the new style):
* Have only 1 test fuction in the test files what will run for all
  debug info separately and this test function should call just
  "self.build(...)" to build an inferior with the right debug info
* When a class is created by python (the class object, not the class
  instance), we will generate a new test method for each debug info
  format in the test class with the name "<test-function>_<debug-info>"
  and remove the original test method. This way unittest2 see multiple
  test methods (1 for each debug info, pretty much as of now) and will
  handle the test selection and the failure reporting correctly (the
  debug info will be visible from the end of the test name)
* Add new annotation @no_debug_info_test to disable the generation of
  multiple tests for each debug info format when the test don't have an
  inferior

Differential revision: http://reviews.llvm.org/D13028

llvm-svn: 248883

1 files changed, 13 insertions, 67 deletions

diff --git a/lldb/test/python_api/thread/TestThreadAPI.py b/lldb/test/python_api/thread/TestThreadAPI.py
index d5b146d07aba..8ace950a46e0 100644
--- a/lldb/test/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/python_api/thread/TestThreadAPI.py
@@ -12,98 +12,44 @@ class ThreadAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
     @python_api_test
-    @dsym_test
-    def test_get_process_with_dsym(self):
+    def test_get_process(self):
         """Test Python SBThread.GetProcess() API."""
-        self.buildDsym()
+        self.build()
         self.get_process()
 
     @python_api_test
-    @dwarf_test
-    def test_get_process_with_dwarf(self):
-        """Test Python SBThread.GetProcess() API."""
-        self.buildDwarf()
-        self.get_process()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_get_stop_description_with_dsym(self):
+    def test_get_stop_description(self):
         """Test Python SBThread.GetStopDescription() API."""
-        self.buildDsym()
+        self.build()
         self.get_stop_description()
 
     @python_api_test
-    @dwarf_test
-    def test_get_stop_description_with_dwarf(self):
-        """Test Python SBThread.GetStopDescription() API."""
-        self.buildDwarf()
-        self.get_stop_description()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_run_to_address_with_dsym(self):
-        """Test Python SBThread.RunToAddress() API."""
-        # We build a different executable than the default buildDwarf() does.
-        d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDsym(dictionary=d)
-        self.setTearDownCleanup(dictionary=d)
-        self.run_to_address(self.exe_name)
-
-    @python_api_test
-    @dwarf_test
-    def test_run_to_address_with_dwarf(self):
+    def test_run_to_address(self):
         """Test Python SBThread.RunToAddress() API."""
-        # We build a different executable than the default buildDwarf() does.
+        # We build a different executable than the default build() does.
         d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDwarf(dictionary=d)
+        self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
         self.run_to_address(self.exe_name)
 
-    @skipUnlessDarwin
     @python_api_test
-    @dsym_test
-    def test_step_out_of_malloc_into_function_b_with_dsym(self):
-        """Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b()."""
-        # We build a different executable than the default buildDsym() does.
-        d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDsym(dictionary=d)
-        self.setTearDownCleanup(dictionary=d)
-        self.step_out_of_malloc_into_function_b(self.exe_name)
-
     @expectedFailureFreeBSD # llvm.org/pr20476
-    @python_api_test
     @expectedFailureWindows # Test crashes
-    @dwarf_test
-    def test_step_out_of_malloc_into_function_b_with_dwarf(self):
+    def test_step_out_of_malloc_into_function_b(self):
         """Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b()."""
-        # We build a different executable than the default buildDwarf() does.
+        # We build a different executable than the default build() does.
         d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDwarf(dictionary=d)
+        self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
         self.step_out_of_malloc_into_function_b(self.exe_name)
 
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_step_over_3_times_with_dsym(self):
-        """Test Python SBThread.StepOver() API."""
-        # We build a different executable than the default buildDsym() does.
-        d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDsym(dictionary=d)
-        self.setTearDownCleanup(dictionary=d)
-        self.step_over_3_times(self.exe_name)
-
     @python_api_test
-    @dwarf_test
-    def test_step_over_3_times_with_dwarf(self):
+    def test_step_over_3_times(self):
         """Test Python SBThread.StepOver() API."""
-        # We build a different executable than the default buildDwarf() does.
+        # We build a different executable than the default build() does.
         d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDwarf(dictionary=d)
+        self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
         self.step_over_3_times(self.exe_name)