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

2 files changed, 66 insertions, 190 deletions

diff --git a/lldb/test/python_api/process/TestProcessAPI.py b/lldb/test/python_api/process/TestProcessAPI.py
index 6bc255abfa6..0aaeca6299e 100644
--- a/lldb/test/python_api/process/TestProcessAPI.py
+++ b/lldb/test/python_api/process/TestProcessAPI.py
@@ -12,71 +12,16 @@ class ProcessAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_read_memory_with_dsym(self):
-        """Test Python SBProcess.ReadMemory() API."""
-        self.buildDsym()
-        self.read_memory()
-
-    @python_api_test
-    @dwarf_test
-    def test_read_memory_with_dwarf(self):
-        """Test Python SBProcess.ReadMemory() API."""
-        self.buildDwarf()
-        self.read_memory()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_write_memory_with_dsym(self):
-        """Test Python SBProcess.WriteMemory() API."""
-        self.buildDsym()
-        self.write_memory()
-
-    @python_api_test
-    @dwarf_test
-    def test_write_memory_with_dwarf(self):
-        """Test Python SBProcess.WriteMemory() API."""
-        self.buildDwarf()
-        self.write_memory()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_access_my_int_with_dsym(self):
-        """Test access 'my_int' using Python SBProcess.GetByteOrder() and other APIs."""
-        self.buildDsym()
-        self.access_my_int()
-
-    @python_api_test
-    @dwarf_test
-    def test_access_my_int_with_dwarf(self):
-        """Test access 'my_int' using Python SBProcess.GetByteOrder() and other APIs."""
-        self.buildDwarf()
-        self.access_my_int()
-
-    @python_api_test
-    def test_remote_launch(self):
-        """Test SBProcess.RemoteLaunch() API with a process not in eStateConnected, and it should fail."""
-        self.buildDefault()
-        self.remote_launch_should_fail()
-
-    @python_api_test
-    def test_get_num_supported_hardware_watchpoints(self):
-        """Test SBProcess.GetNumSupportedHardwareWatchpoints() API with a process."""
-        self.buildDefault()
-        self.get_num_supported_hardware_watchpoints()
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number("main.cpp", "// Set break point at this line and check variable 'my_char'.")
 
-    def read_memory(self):
+    @python_api_test
+    def test_read_memory(self):
         """Test Python SBProcess.ReadMemory() API."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         target = self.dbg.CreateTarget(exe)
@@ -156,8 +101,10 @@ class ProcessAPITestCase(TestBase):
         if my_uint32 != 12345:
             self.fail("Result from SBProcess.ReadUnsignedFromMemory() does not match our expected output")
 
-    def write_memory(self):
+    @python_api_test
+    def test_write_memory(self):
         """Test Python SBProcess.WriteMemory() API."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         target = self.dbg.CreateTarget(exe)
@@ -206,8 +153,10 @@ class ProcessAPITestCase(TestBase):
                     exe=False,
             startstr = 'a')
 
-    def access_my_int(self):
+    @python_api_test
+    def test_access_my_int(self):
         """Test access 'my_int' using Python SBProcess.GetByteOrder() and other APIs."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         target = self.dbg.CreateTarget(exe)
@@ -294,8 +243,10 @@ class ProcessAPITestCase(TestBase):
             for i in new_bytes:
                 print "byte:", i
 
-    def remote_launch_should_fail(self):
+    @python_api_test
+    def test_remote_launch(self):
         """Test SBProcess.RemoteLaunch() API with a process not in eStateConnected, and it should fail."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         target = self.dbg.CreateTarget(exe)
@@ -312,8 +263,10 @@ class ProcessAPITestCase(TestBase):
         success = process.RemoteLaunch(None, None, None, None, None, None, 0, False, error)
         self.assertTrue(not success, "RemoteLaunch() should fail for process state != eStateConnected")
 
-    def get_num_supported_hardware_watchpoints(self):
+    @python_api_test
+    def test_get_num_supported_hardware_watchpoints(self):
         """Test SBProcess.GetNumSupportedHardwareWatchpoints() API with a process."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
diff --git a/lldb/test/python_api/process/io/TestProcessIO.py b/lldb/test/python_api/process/io/TestProcessIO.py
index 66ac0bdb0d8..9bd3b82a4f5 100644
--- a/lldb/test/python_api/process/io/TestProcessIO.py
+++ b/lldb/test/python_api/process/io/TestProcessIO.py
@@ -10,99 +10,77 @@ class ProcessIOTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_stdin_by_api_with_dsym(self):
-        """Exercise SBProcess.PutSTDIN()."""
-        self.buildDsym()
-        self.do_stdin_by_api()
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+        # Get the full path to our executable to be debugged.
+        self.exe = os.path.join(os.getcwd(), "process_io")
+        self.local_input_file  = os.path.join(os.getcwd(), "input.txt")
+        self.local_output_file = os.path.join(os.getcwd(), "output.txt")
+        self.local_error_file  = os.path.join(os.getcwd(), "error.txt")
+
+        self.input_file  = os.path.join(self.get_process_working_directory(), "input.txt")
+        self.output_file = os.path.join(self.get_process_working_directory(), "output.txt")
+        self.error_file  = os.path.join(self.get_process_working_directory(), "error.txt")
+        self.lines = ["Line 1", "Line 2", "Line 3"]
 
     @skipIfWindows # stdio manipulation unsupported on Windows
     @python_api_test
-    @dwarf_test
-    def test_stdin_by_api_with_dwarf(self):
+    def test_stdin_by_api(self):
         """Exercise SBProcess.PutSTDIN()."""
-        self.buildDwarf()
-        self.do_stdin_by_api()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_stdin_redirection_with_dsym(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDIN without specifying STDOUT or STDERR."""
-        self.buildDsym()
-        self.do_stdin_redirection()
+        self.build()
+        self.create_target()
+        self.run_process(True)
+        output = self.process.GetSTDOUT(1000)
+        self.check_process_output(output, output)
 
     @skipIfWindows # stdio manipulation unsupported on Windows
     @python_api_test
-    @dwarf_test
-    def test_stdin_redirection_with_dwarf(self):
+    def test_stdin_redirection(self):
         """Exercise SBLaunchInfo::AddOpenFileAction() for STDIN without specifying STDOUT or STDERR."""
-        self.buildDwarf()
-        self.do_stdin_redirection()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_stdout_redirection_with_dsym(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT without specifying STDIN or STDERR."""
-        self.buildDsym()
-        self.do_stdout_redirection()
+        self.build()
+        self.create_target()
+        self.redirect_stdin()
+        self.run_process(False)
+        output = self.process.GetSTDOUT(1000)        
+        self.check_process_output(output, output)
 
     @skipIfWindows # stdio manipulation unsupported on Windows
     @python_api_test
-    @dwarf_test
-    def test_stdout_redirection_with_dwarf(self):
+    def test_stdout_redirection(self):
         """Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT without specifying STDIN or STDERR."""
-        self.buildDwarf()
-        self.do_stdout_redirection()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_stderr_redirection_with_dsym(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDERR without specifying STDIN or STDOUT."""
-        self.buildDsym()
-        self.do_stderr_redirection()
+        self.build()
+        self.create_target()
+        self.redirect_stdout()
+        self.run_process(True)
+        output = self.read_output_file_and_delete()
+        error = self.process.GetSTDOUT(1000)
+        self.check_process_output(output, error)
 
     @skipIfWindows # stdio manipulation unsupported on Windows
     @python_api_test
-    @dwarf_test
-    def test_stderr_redirection_with_dwarf(self):
+    def test_stderr_redirection(self):
         """Exercise SBLaunchInfo::AddOpenFileAction() for STDERR without specifying STDIN or STDOUT."""
-        self.buildDwarf()
-        self.do_stderr_redirection()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_stdout_stderr_redirection_with_dsym(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT and STDERR without redirecting STDIN."""
-        self.buildDsym()
-        self.do_stdout_stderr_redirection()
+        self.build()
+        self.create_target()
+        self.redirect_stderr()
+        self.run_process(True)
+        output = self.process.GetSTDOUT(1000)
+        error = self.read_error_file_and_delete()
+        self.check_process_output(output, error)
 
     @skipIfWindows # stdio manipulation unsupported on Windows
     @python_api_test
-    @dwarf_test
-    def test_stdout_stderr_redirection_with_dwarf(self):
+    def test_stdout_stderr_redirection(self):
         """Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT and STDERR without redirecting STDIN."""
-        self.buildDwarf()
-        self.do_stdout_stderr_redirection()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Get the full path to our executable to be debugged.
-        self.exe = os.path.join(os.getcwd(), "process_io")
-        self.local_input_file  = os.path.join(os.getcwd(), "input.txt")
-        self.local_output_file = os.path.join(os.getcwd(), "output.txt")
-        self.local_error_file  = os.path.join(os.getcwd(), "error.txt")
-
-        self.input_file  = os.path.join(self.get_process_working_directory(), "input.txt")
-        self.output_file = os.path.join(self.get_process_working_directory(), "output.txt")
-        self.error_file  = os.path.join(self.get_process_working_directory(), "error.txt")
-        self.lines = ["Line 1", "Line 2", "Line 3"]
+        self.build()
+        self.create_target()
+        self.redirect_stdout()
+        self.redirect_stderr()
+        self.run_process(True)
+        output = self.read_output_file_and_delete()
+        error = self.read_error_file_and_delete()
+        self.check_process_output(output, error)
 
     # target_file - path on local file system or remote file system if running remote
     # local_file - path on local system
@@ -168,61 +146,6 @@ class ProcessIOTestCase(TestBase):
     def redirect_stderr(self):
         '''Redirect STDERR (file descriptor 2) to use our error.txt file'''
         self.launch_info.AddOpenFileAction(2, self.error_file, False, True);
-    
-    def do_stdin_redirection(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDIN without specifying STDOUT or STDERR."""
-        self.create_target()
-        self.redirect_stdin()
-        self.run_process(False)
-        output = self.process.GetSTDOUT(1000)        
-        self.check_process_output(output, output)
-
-    def do_stdout_redirection(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT without specifying STDIN or STDERR."""
-        self.create_target()
-        self.redirect_stdout()
-        self.run_process(True)
-        output = self.read_output_file_and_delete()
-        error = self.process.GetSTDOUT(1000)
-        self.check_process_output(output, error)
-
-    def do_stderr_redirection(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDERR without specifying STDIN or STDOUT."""
-        self.create_target()
-        self.redirect_stderr()
-        self.run_process(True)
-        output = self.process.GetSTDOUT(1000)
-        error = self.read_error_file_and_delete()
-        self.check_process_output(output, error)
-
-    def do_stdout_stderr_redirection(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT and STDERR without redirecting STDIN."""
-        self.create_target()
-        self.redirect_stdout()
-        self.redirect_stderr()
-        self.run_process(True)
-        output = self.read_output_file_and_delete()
-        error = self.read_error_file_and_delete()
-        self.check_process_output(output, error)
-
-    def do_stdin_stdout_stderr_redirection(self):
-        """Exercise SBLaunchInfo::AddOpenFileAction() for STDIN, STDOUT and STDERR."""
-        # Make the input.txt file to use
-        self.create_target()
-        self.redirect_stdin()
-        self.redirect_stdout()
-        self.redirect_stderr()
-        self.run_process(True)
-        output = self.read_output_file_and_delete()
-        error = self.read_error_file_and_delete()
-        self.check_process_output(output, error)
-        
-    def do_stdin_by_api(self):
-        """Launch a process and use SBProcess.PutSTDIN() to write data to it."""
-        self.create_target()
-        self.run_process(True)
-        output = self.process.GetSTDOUT(1000)
-        self.check_process_output(output, output)
         
     def run_process(self, put_stdin):
         '''Run the process to completion and optionally put lines to STDIN via the API if "put_stdin" is True'''