OS X unexpected success cleanup

TestPersistObjCPointeeType and TestObjCNewSyntax marked up to expect
success on clang >= 7.0.0.

TestMultipleDebuggers passed 25/25 times, taking off intermittent.
If this changes, I'll make sure it goes into a flaky/flakey category.

llvm-svn: 247601

3 files changed, 11 insertions, 6 deletions

diff --git a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
index d238692a0c0..28126e2f9a1 100644
--- a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
+++ b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
@@ -18,7 +18,6 @@ class TestMultipleSimultaneousDebuggers(TestBase):
 
     @skipIfi386
     @skipIfNoSBHeaders
-    @expectedFailureDarwin("llvm.org/pr20282") # intermittent
     @expectedFailureFreeBSD("llvm.org/pr20282")
     @expectedFailureLinux("llvm.org/pr20282")
     def test_multiple_debuggers(self):
diff --git a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index 9c8c3fe1e70..c1c5eb2dbec 100644
--- a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
@@ -19,7 +19,9 @@ class PersistObjCPointeeType(TestBase):
 
     @skipUnlessDarwin
     @dsym_test
-    @expectedFailureDarwin('http://llvm.org/pr23504') # can't compile inferior with Xcode 6.1.1 or 6.2
+    @expectedFailureAll(
+        bugnumber='http://llvm.org/pr23504',
+        oslist=['macosx'], compiler='clang', compiler_version=['<', '7.0.0'])
     def test_with_dsym(self):
         """Test that we can p *objcObject"""
         self.buildDsym()
@@ -27,7 +29,9 @@ class PersistObjCPointeeType(TestBase):
 
     @skipUnlessDarwin
     @dwarf_test
-    @expectedFailureDarwin('http://llvm.org/pr23504') # can't compile inferior with Xcode 6.1.1 or 6.2
+    @expectedFailureAll(
+        bugnumber='http://llvm.org/pr23504',
+        oslist=['macosx'], compiler='clang', compiler_version=['<', '7.0.0'])
     def test_with_dwarf(self):
         """Test that we can p *objcObject"""
         self.buildDwarf()
@@ -36,7 +40,7 @@ class PersistObjCPointeeType(TestBase):
     def do_my_test(self):
         def cleanup():
             pass
-        
+
         # Execute the cleanup function during test case tear down.
         self.addTearDownHook(cleanup)
 
diff --git a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
index 89762764839..29e86fa8de0 100644
--- a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
+++ b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
@@ -16,7 +16,8 @@ class ObjCNewSyntaxTestCase(TestBase):
 
     @skipUnlessDarwin
     @dsym_test
-    @expectedFailureDarwin # expr -- @((char*)"Hello world" + 6) cannot box a string value because NSString has not been declared
+    @expectedFailureAll(
+        oslist=['macosx'], compiler='clang', compiler_version=['<', '7.0.0'])
     def test_expr_with_dsym(self):
         self.buildDsym()
         self.expr()
@@ -25,7 +26,8 @@ class ObjCNewSyntaxTestCase(TestBase):
     @skipIfFreeBSD
     @skipIfLinux
     @skipIfWindows
-    @expectedFailureDarwin # expr -- @((char*)"Hello world" + 6) cannot box a string value because NSString has not been declared
+    @expectedFailureAll(
+        oslist=['macosx'], compiler='clang', compiler_version=['<', '7.0.0'])
     def test_expr_with_dwarf(self):
         self.buildDwarf()
         self.expr()