Vendor import of lldb trunk r290819:vendor/lldb/lldb-trunk-r290819

https://llvm.org/svn/llvm-project/lldb/trunk@290819

1 files changed, 20 insertions, 13 deletions

diff --git a/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
index 56fcaa050782..367eeb2638d1 100644
--- a/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -3,7 +3,6 @@
 from __future__ import print_function
 
 
-
 import unittest2
 import platform
 from distutils.version import StrictVersion
@@ -12,6 +11,7 @@ from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class IncompleteModulesTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -24,37 +24,44 @@ class IncompleteModulesTestCase(TestBase):
 
     @skipUnlessDarwin
     @unittest2.expectedFailure("rdar://20416388")
-    @unittest2.skipIf(platform.system() != "Darwin" or StrictVersion('12.0.0') > platform.release(), "Only supported on Darwin 12.0.0+")
-    @skipIfDarwin  # llvm.org/pr26267
+    @skipIf(macos_version=["<", "10.12"])
     def test_expr(self):
         self.build()
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # Break inside the foo function which takes a bar_ptr argument.
-        lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+        lldbutil.run_break_set_by_file_and_line(
+            self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
 
         self.runCmd("run", RUN_SUCCEEDED)
 
         # The stop reason of the thread should be breakpoint.
         self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-            substrs = ['stopped',
-                       'stop reason = breakpoint'])
+                    substrs=['stopped',
+                             'stop reason = breakpoint'])
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-            substrs = [' resolved, hit count = 1'])
+                    substrs=[' resolved, hit count = 1'])
 
-        self.runCmd("settings set target.clang-module-search-paths \"" + os.getcwd() + "\"")
+        self.runCmd(
+            "settings set target.clang-module-search-paths \"" +
+            os.getcwd() +
+            "\"")
 
         self.expect("expr @import myModule; 3", VARIABLES_DISPLAYED_CORRECTLY,
-            substrs = ["int", "3"])
+                    substrs=["int", "3"])
 
-        self.expect("expr [myObject privateMethod]", VARIABLES_DISPLAYED_CORRECTLY,
-            substrs = ["int", "5"])
+        self.expect(
+            "expr [myObject privateMethod]",
+            VARIABLES_DISPLAYED_CORRECTLY,
+            substrs=[
+                "int",
+                "5"])
 
         self.expect("expr MIN(2,3)", "#defined macro was found",
-            substrs = ["int", "2"])
+                    substrs=["int", "2"])
 
         self.expect("expr MAX(2,3)", "#undefd macro was correcltly not found",
-            error=True)
+                    error=True)