1 files changed, 8 insertions, 35 deletions
diff --git a/lldb/test/lang/cpp/stl/TestSTL.py b/lldb/test/lang/cpp/stl/TestSTL.py
index 4a1b2e0eb2f..b74009fbefd 100644
--- a/lldb/test/lang/cpp/stl/TestSTL.py
+++ b/lldb/test/lang/cpp/stl/TestSTL.py
@@ -12,39 +12,6 @@ class STLTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    # rdar://problem/10400981
-    @unittest2.expectedFailure
-    @skipUnlessDarwin
-    @dsym_test
-    def test_with_dsym(self):
-        """Test some expressions involving STL data types."""
-        self.buildDsym()
-        self.step_stl_exprs()
-
-    # rdar://problem/10400981
-    @unittest2.expectedFailure
-    @dwarf_test
-    def test_with_dwarf(self):
-        """Test some expressions involving STL data types."""
-        self.buildDwarf()
-        self.step_stl_exprs()
-
-    @python_api_test
-    @dsym_test
-    @skipUnlessDarwin
-    def test_SBType_template_aspects_with_dsym(self):
-        """Test APIs for getting template arguments from an SBType."""
-        self.buildDsym()
-        self.sbtype_template_apis()
-
-    @expectedFailureIcc # icc 13.1 and 14-beta do not emit DW_TAG_template_type_parameter
-    @python_api_test
-    @dwarf_test
-    def test_SBType_template_aspects_with_dwarf(self):
-        """Test APIs for getting template arguments from an SBType."""
-        self.buildDwarf()
-        self.sbtype_template_apis()
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
@@ -52,8 +19,11 @@ class STLTestCase(TestBase):
         self.source = 'main.cpp'
         self.line = line_number(self.source, '// Set break point at this line.')
 
-    def step_stl_exprs(self):
+    # rdar://problem/10400981
+    @unittest2.expectedFailure
+    def test(self):
         """Test some expressions involving STL data types."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         # The following two lines, if uncommented, will enable loggings.
@@ -93,8 +63,11 @@ class STLTestCase(TestBase):
         self.expect('expr associative_array["hello"]',
             substrs = [' = 2'])
 
-    def sbtype_template_apis(self):
+    @expectedFailureIcc # icc 13.1 and 14-beta do not emit DW_TAG_template_type_parameter
+    @python_api_test
+    def test_SBType_template_aspects(self):
         """Test APIs for getting template arguments from an SBType."""
+        self.build()
         exe = os.path.join(os.getcwd(), 'a.out')
 
         # Create a target by the debugger.