1 files changed, 8 insertions, 29 deletions
diff --git a/lldb/test/lang/objc/modules/TestObjCModules.py b/lldb/test/lang/objc/modules/TestObjCModules.py
index 09a5bfa7b1c..b3a5d1395ae 100644
--- a/lldb/test/lang/objc/modules/TestObjCModules.py
+++ b/lldb/test/lang/objc/modules/TestObjCModules.py
@@ -14,35 +14,20 @@ class ObjCModulesTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @dsym_test
-    @unittest2.expectedFailure("rdar://20416388")
-    def test_expr_with_dsym(self):
-        self.buildDsym()
-        self.expr()
-
-    @dwarf_test
-    @skipUnlessDarwin
-    @unittest2.expectedFailure("rdar://20416388")
-    def test_expr_with_dwarf(self):
-        self.buildDwarf()
-        self.expr()
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.m', '// Set breakpoint 0 here.')
 
-    def applies(self):
-        if platform.system() != "Darwin":
-            return False
-        if StrictVersion('12.0.0') > platform.release():
-            return False
-
-        return True
+    @skipUnlessDarwin
+    @unittest2.expectedFailure("rdar://20416388")
+    @unittest2.skipIf(platform.system() != "Darwin" or StrictVersion('12.0.0') > platform.release(), "Only supported on Darwin 12.0.0+")
+    def test_expr(self):
+        if not self.applies():
+            return
 
-    def common_setup(self):
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
@@ -60,12 +45,6 @@ class ObjCModulesTestCase(TestBase):
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
             substrs = [' resolved, hit count = 1'])
 
-    def expr(self):
-        if not self.applies():
-            return
-
-        self.common_setup()
-
         self.expect("expr @import Darwin; 3", VARIABLES_DISPLAYED_CORRECTLY,
             substrs = ["int", "3"])
 
@@ -86,7 +65,7 @@ class ObjCModulesTestCase(TestBase):
 
         self.expect("p [NSURL URLWithString:@\"http://lldb.llvm.org\"].scheme", VARIABLES_DISPLAYED_CORRECTLY,
             substrs = ["http"])
-            
+
 if __name__ == '__main__':
     import atexit
     lldb.SBDebugger.Initialize()