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, 14 insertions, 1 deletions

diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index 00589e4ce56..b30c143aa7d 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -13,6 +13,7 @@ class HelpCommandTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
+    @no_debug_info_test
     def test_simplehelp(self):
         """A simple test of 'help' command and its output."""
         self.expect("help",
@@ -24,12 +25,14 @@ class HelpCommandTestCase(TestBase):
         self.expect("help", matching=True,
                     substrs = ['next'])
     
+    @no_debug_info_test
     def test_help_on_help(self):
         """Testing the help on the help facility."""
         self.expect("help help", matching=True,
                     substrs = ['--hide-aliases',
                                '--hide-user-commands'])
 
+    @no_debug_info_test
     def version_number_string(self):
         """Helper function to find the version number string of lldb."""
         plist = os.path.join(os.environ["LLDB_SRC"], "resources", "LLDB-Info.plist")
@@ -64,12 +67,13 @@ class HelpCommandTestCase(TestBase):
         # Use None to signify that we are not able to grok the version number.
         return None
 
-
+    @no_debug_info_test
     def test_help_arch(self):
         """Test 'help arch' which should list of supported architectures."""
         self.expect("help arch",
             substrs = ['arm', 'x86_64', 'i386'])
 
+    @no_debug_info_test
     def test_help_version(self):
         """Test 'help version' and 'version' commands."""
         self.expect("help version",
@@ -85,11 +89,13 @@ class HelpCommandTestCase(TestBase):
         self.expect("version",
             patterns = search_regexp)
 
+    @no_debug_info_test
     def test_help_should_not_crash_lldb(self):
         """Command 'help disasm' should not crash lldb."""
         self.runCmd("help disasm", check=False)
         self.runCmd("help unsigned-integer")
 
+    @no_debug_info_test
     def test_help_should_not_hang_emacsshell(self):
         """Command 'settings set term-width 0' should not hang the help command."""
         self.expect("settings set term-width 0",
@@ -99,12 +105,14 @@ class HelpCommandTestCase(TestBase):
         self.expect("help",
             startstr = 'Debugger commands:')
 
+    @no_debug_info_test
     def test_help_breakpoint_set(self):
         """Test that 'help breakpoint set' does not print out redundant lines of:
         'breakpoint set [-s <shlib-name>] ...'."""
         self.expect("help breakpoint set", matching=False,
             substrs = ['breakpoint set [-s <shlib-name>]'])
 
+    @no_debug_info_test
     def test_help_image_dump_symtab_should_not_crash(self):
         """Command 'help image dump symtab' should not crash lldb."""
         # 'image' is an alias for 'target modules'.
@@ -112,6 +120,7 @@ class HelpCommandTestCase(TestBase):
             substrs = ['dump symtab',
                        'sort-order'])
 
+    @no_debug_info_test
     def test_help_image_du_sym_is_ambiguous(self):
         """Command 'help image du sym' is ambiguous and spits out the list of candidates."""
         self.expect("help image du sym",
@@ -120,17 +129,20 @@ class HelpCommandTestCase(TestBase):
                        'symfile',
                        'symtab'])
 
+    @no_debug_info_test
     def test_help_image_du_line_should_work(self):
         """Command 'help image du line' is not ambiguous and should work."""
         # 'image' is an alias for 'target modules'.
         self.expect("help image du line",
             substrs = ['Dump the line table for one or more compilation units'])
 
+    @no_debug_info_test
     def test_help_target_variable_syntax(self):
         """Command 'help target variable' should display <variable-name> ..."""
         self.expect("help target variable",
             substrs = ['<variable-name> [<variable-name> [...]]'])
 
+    @no_debug_info_test
     def test_help_watchpoint_and_its_args(self):
         """Command 'help watchpoint', 'help watchpt-id', and 'help watchpt-id-list' should work."""
         self.expect("help watchpoint",
@@ -140,6 +152,7 @@ class HelpCommandTestCase(TestBase):
         self.expect("help watchpt-id-list",
             substrs = ['<watchpt-id-list>'])
 
+    @no_debug_info_test
     def test_help_watchpoint_set(self):
         """Test that 'help watchpoint set' prints out 'expression' and 'variable'
         as the possible subcommands."""