Second batch of adding @dsym_test/@dwarf_test decorators to existing test cases.

Plus some minor cleanup of test method names.
Third and final batch is coming.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@154197 91177308-0d34-0410-b5e6-96231b3b80d8

13 files changed, 34 insertions, 0 deletions

diff --git a/test/lang/c/anonymous/TestAnonymous.py b/test/lang/c/anonymous/TestAnonymous.py
index bc533c79c..24df5fcf2 100644
--- a/test/lang/c/anonymous/TestAnonymous.py
+++ b/test/lang/c/anonymous/TestAnonymous.py
@@ -9,10 +9,12 @@ class AnonymousTestCase(TestBase):
 
     mydir = os.path.join("lang", "c", "anonymous")
 
+    @dsym_test
     def test_expr_with_dsym(self):
         self.buildDsym()
         self.expr()
 
+    @dwarf_test
     def test_expr_with_dwarf(self):
         self.buildDwarf()
         self.expr()
diff --git a/test/lang/c/array_types/TestArrayTypes.py b/test/lang/c/array_types/TestArrayTypes.py
index a2d94b16a..01822d786 100644
--- a/test/lang/c/array_types/TestArrayTypes.py
+++ b/test/lang/c/array_types/TestArrayTypes.py
@@ -10,6 +10,7 @@ class ArrayTypesTestCase(TestBase):
     mydir = os.path.join("lang", "c", "array_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test 'frame variable var_name' on some variables with array types."""
         self.buildDsym()
@@ -17,17 +18,20 @@ class ArrayTypesTestCase(TestBase):
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @python_api_test    
+    @dsym_test
     def test_with_dsym_and_python_api(self):
         """Use Python APIs to inspect variables with array types."""
         self.buildDsym()
         self.array_types_python()
 
+    @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Test 'frame variable var_name' on some variables with array types."""
         self.buildDwarf()
         self.array_types()
 
     @python_api_test
+    @dwarf_test
     def test_with_dwarf_and_python_api(self):
         """Use Python APIs to inspect variables with array types."""
         self.buildDwarf()
diff --git a/test/lang/c/bitfields/TestBitfields.py b/test/lang/c/bitfields/TestBitfields.py
index ef83139e4..f9b0ce19f 100644
--- a/test/lang/c/bitfields/TestBitfields.py
+++ b/test/lang/c/bitfields/TestBitfields.py
@@ -10,6 +10,7 @@ class BitfieldsTestCase(TestBase):
     mydir = os.path.join("lang", "c", "bitfields")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test 'frame variable ...' on a variable with bitfields."""
         self.buildDsym()
@@ -17,17 +18,20 @@ class BitfieldsTestCase(TestBase):
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @python_api_test
+    @dsym_test
     def test_with_dsym_and_python_api(self):
         """Use Python APIs to inspect a bitfields variable."""
         self.buildDsym()
         self.bitfields_variable_python()
 
+    @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Test 'frame variable ...' on a variable with bitfields."""
         self.buildDwarf()
         self.bitfields_variable()
 
     @python_api_test
+    @dwarf_test
     def test_with_dwarf_and_python_api(self):
         """Use Python APIs to inspect a bitfields variable."""
         self.buildDwarf()
diff --git a/test/lang/c/blocks/TestBlocks.py b/test/lang/c/blocks/TestBlocks.py
index ef2a0ecdc..17609834a 100644
--- a/test/lang/c/blocks/TestBlocks.py
+++ b/test/lang/c/blocks/TestBlocks.py
@@ -11,11 +11,13 @@ class AnonymousTestCase(TestBase):
     lines = []
 
     @unittest2.expectedFailure
+    @dsym_test
     def test_expr_with_dsym(self):
         self.buildDsym()
         self.expr()
 
     @unittest2.expectedFailure
+    @dwarf_test
     def test_expr_with_dwarf(self):
         self.buildDwarf()
         self.expr()
diff --git a/test/lang/c/enum_types/TestEnumTypes.py b/test/lang/c/enum_types/TestEnumTypes.py
index 0dd686614..21394b0ef 100644
--- a/test/lang/c/enum_types/TestEnumTypes.py
+++ b/test/lang/c/enum_types/TestEnumTypes.py
@@ -10,6 +10,7 @@ class EnumTypesTestCase(TestBase):
     mydir = os.path.join("lang", "c", "enum_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym(self):
         """Test 'image lookup -t days' and check for correct display."""
         self.buildDsym()
@@ -17,6 +18,7 @@ class EnumTypesTestCase(TestBase):
 
     # rdar://problem/8394746
     # 'image lookup -t days' returns nothing with dwarf debug format.
+    @dwarf_test
     def test_with_dwarf(self):
         """Test 'image lookup -t days' and check for correct display."""
         self.buildDwarf()
diff --git a/test/lang/c/forward/TestForwardDeclaration.py b/test/lang/c/forward/TestForwardDeclaration.py
index 2270e56f9..d4649a66c 100644
--- a/test/lang/c/forward/TestForwardDeclaration.py
+++ b/test/lang/c/forward/TestForwardDeclaration.py
@@ -10,6 +10,7 @@ class ForwardDeclarationTestCase(TestBase):
     mydir = os.path.join("lang", "c", "forward")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym_and_run_command(self):
         """Display *bar_ptr when stopped on a function with forward declaration of struct bar."""
         self.buildDsym()
@@ -19,6 +20,7 @@ class ForwardDeclarationTestCase(TestBase):
     # 'expression *bar_ptr' seg faults
     # rdar://problem/8546815
     # './dotest.py -v -t forward' fails for test_with_dwarf_and_run_command
+    @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Display *bar_ptr when stopped on a function with forward declaration of struct bar."""
         self.buildDwarf()
diff --git a/test/lang/c/function_types/TestFunctionTypes.py b/test/lang/c/function_types/TestFunctionTypes.py
index e4680ab01..db1a8c9f1 100644
--- a/test/lang/c/function_types/TestFunctionTypes.py
+++ b/test/lang/c/function_types/TestFunctionTypes.py
@@ -10,22 +10,26 @@ class FunctionTypesTestCase(TestBase):
     mydir = os.path.join("lang", "c", "function_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym(self):
         """Test 'callback' has function ptr type, then break on the function."""
         self.buildDsym()
         self.function_types()
 
+    @dwarf_test
     def test_with_dwarf(self):
         """Test 'callback' has function ptr type, then break on the function."""
         self.buildDwarf()
         self.function_types()
     
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_pointers_with_dsym(self):
         """Test that a function pointer to 'printf' works and can be called."""
         self.buildDsym()
         self.function_pointers()
     
+    @dwarf_test
     def test_pointers_with_dwarf(self):
         """Test that a function pointer to 'printf' works and can be called."""
         self.buildDwarf()
diff --git a/test/lang/c/global_variables/TestGlobalVariables.py b/test/lang/c/global_variables/TestGlobalVariables.py
index d9fcb540b..6b4d1363c 100644
--- a/test/lang/c/global_variables/TestGlobalVariables.py
+++ b/test/lang/c/global_variables/TestGlobalVariables.py
@@ -10,11 +10,13 @@ class GlobalVariablesTestCase(TestBase):
     mydir = os.path.join("lang", "c", "global_variables")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym(self):
         """Test 'frame variable -s -a' which omits args and shows scopes."""
         self.buildDsym()
         self.global_variables()
 
+    @dwarf_test
     def test_with_dwarf(self):
         """Test 'frame variable -s -a' which omits args and shows scopes."""
         self.buildDwarf()
diff --git a/test/lang/c/set_values/TestSetValues.py b/test/lang/c/set_values/TestSetValues.py
index d9e1ebf1c..1070690b3 100644
--- a/test/lang/c/set_values/TestSetValues.py
+++ b/test/lang/c/set_values/TestSetValues.py
@@ -10,11 +10,13 @@ class SetValuesTestCase(TestBase):
     mydir = os.path.join("lang", "c", "set_values")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym(self):
         """Test settings and readings of program variables."""
         self.buildDsym()
         self.set_values()
 
+    @dwarf_test
     def test_with_dwarf(self):
         """Test settings and readings of program variables."""
         self.buildDwarf()
diff --git a/test/lang/c/shared_lib/TestSharedLib.py b/test/lang/c/shared_lib/TestSharedLib.py
index f0dbbb76d..fc972d972 100644
--- a/test/lang/c/shared_lib/TestSharedLib.py
+++ b/test/lang/c/shared_lib/TestSharedLib.py
@@ -9,21 +9,25 @@ class SharedLibTestCase(TestBase):
 
     mydir = os.path.join("lang", "c", "shared_lib")
 
+    @dsym_test
     def test_expr_with_dsym(self):
         """Test that types work when defined in a shared library and forward-declared in the main executable"""
         self.buildDsym()
         self.expr()
 
+    @dwarf_test
     def test_expr_with_dwarf(self):
         """Test that types work when defined in a shared library and forward-declared in the main executable"""
         self.buildDwarf()
         self.expr()
 
+    @dsym_test
     def test_frame_variable_with_dsym(self):
         """Test that types work when defined in a shared library and forward-declared in the main executable"""
         self.buildDsym()
         self.frame_var()
 
+    @dwarf_test
     def test_frame_variable_with_dwarf(self):
         """Test that types work when defined in a shared library and forward-declared in the main executable"""
         self.buildDwarf()
diff --git a/test/lang/c/stepping/TestThreadStepping.py b/test/lang/c/stepping/TestThreadStepping.py
index ee15968be..42e6932c5 100644
--- a/test/lang/c/stepping/TestThreadStepping.py
+++ b/test/lang/c/stepping/TestThreadStepping.py
@@ -13,11 +13,13 @@ class ThreadSteppingTestCase(TestBase):
     mydir = os.path.join("lang", "c", "stepping")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_step_out_with_dsym_and_run_command(self):
         """Exercise thread step-out and frame select followed by thread step-out."""
         self.buildDwarf()
         self.thread_step_out()
 
+    @dwarf_test
     def test_step_out_with_dwarf_and_run_command(self):
         """Exercise thread step-out and frame select followed by thread step-out."""
         self.buildDwarf()
diff --git a/test/lang/c/strings/TestCStrings.py b/test/lang/c/strings/TestCStrings.py
index e906ad6ae..4614b15fb 100644
--- a/test/lang/c/strings/TestCStrings.py
+++ b/test/lang/c/strings/TestCStrings.py
@@ -9,11 +9,13 @@ class CStringsTestCase(TestBase):
     mydir = os.path.join("lang", "c", "strings")
     
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym_and_run_command(self):
         """Tests that C strings work as expected in expressions"""
         self.buildDsym()
         self.static_method_commands()
 
+    @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Tests that C strings work as expected in expressions"""
         self.buildDwarf()
diff --git a/test/lang/c/struct_types/TestStructTypes.py b/test/lang/c/struct_types/TestStructTypes.py
index 65efc7f9a..b7d22b99e 100644
--- a/test/lang/c/struct_types/TestStructTypes.py
+++ b/test/lang/c/struct_types/TestStructTypes.py
@@ -14,11 +14,13 @@ class StructTypesTestCase(TestBase):
     mydir = os.path.join("lang", "c", "struct_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
     def test_with_dsym(self):
         """Test that break on a struct declaration has no effect."""
         self.buildDsym()
         self.struct_types()
 
+    @dwarf_test
     def test_with_dwarf(self):
         """Test that break on a struct declaration has no effect."""
         self.buildDwarf()