Merge pull request swiftlang#1997 from Teemperor/MakeSwiftTestDecoratorNotAlwaysSkip

[lldb][swift] Make swiftTest decorator not always skip and skipIf regressed tests temporarily

Author: adrian-prantl

lldb/packages/Python/lldbsuite/test/decorators.py

@@ -626,9 +626,8 @@ def skipUnlessTargetAndroid(func):
 def swiftTest(func):
     """Decorate the item as a Swift test (Darwin/Linux only, no i386)."""
     def is_not_swift_compatible(self):
-        swift_enabled_error = _get_bool_config_skip_if_decorator("swift")(func)
-        if swift_enabled_error:
-            return swift_enabled_error
+        if not _get_bool_config("swift"):
+           return "Swift plugin not enabled"
         if self.getDebugInfo() == "gmodules":
             return "skipping (gmodules only makes sense for clang tests)"
 
@@ -886,11 +885,14 @@ def skipIfAsan(func):
     """Skip this test if the environment is set up to run LLDB *itself* under ASAN."""
     return skipTestIfFn(is_running_under_asan)(func)
 
-def _get_bool_config_skip_if_decorator(key):
+def _get_bool_config(key):
     config = lldb.SBDebugger.GetBuildConfiguration()
     value_node = config.GetValueForKey(key)
     fail_value = True # More likely to notice if something goes wrong
-    have = value_node.GetValueForKey("value").GetBooleanValue(fail_value)
+    return value_node.GetValueForKey("value").GetBooleanValue(fail_value)
+
+def _get_bool_config_skip_if_decorator(key):
+    have = _get_bool_config(key)
     return unittest2.skipIf(not have, "requires " + key)
 
 def skipIfCursesSupportMissing(func):

lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py

@@ -25,6 +25,7 @@ class TestSwiftHeadermapConflict(TestBase):
     def setUp(self):
         TestBase.setUp(self)
 
+    @skipIf #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     @skipIf(bugnumber="rdar://60396797",
             setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py

@@ -24,6 +24,7 @@ class TestSwiftRemoteASTImport(TestBase):
     def setUp(self):
         TestBase.setUp(self)
 
+    @expectedFailureAll #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

lldb/test/API/lang/swift/dwarfimporter/C/TestSwiftDWARFImporterC.py

@@ -67,6 +67,7 @@ def test_dwarf_importer(self):
         target.Clear()
         lldb.SBDebugger.MemoryPressureDetected()
 
+    @expectedFailureAll #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     @skipIf(archs=['ppc64le'], bugnumber='SR-10214')
     @swiftTest
     # This test needs a working Remote Mirrors implementation.

lldb/test/API/lang/swift/expression/static/TestSwiftExpressionsInClassFunctions.py

@@ -39,6 +39,7 @@ def check_expression(self, expression, expected_result, use_summary=True):
         self.assertTrue(answer == expected_result, report_str)
 
 
+    @expectedFailureAll #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     @swiftTest
     def test_expressions_in_class_functions(self):
         """Test expressions in class func contexts"""

lldb/test/API/lang/swift/generic_existentials/TestGenericExistentials.py

@@ -1,4 +1,6 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest,
+                          expectedFailureAll #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
+                          ])

lldb/test/API/lang/swift/opaque_existentials/TestOpaqueExistentials.py

@@ -1,4 +1,6 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest,
+                          expectedFailureAll #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
+                          ])

lldb/test/API/lang/swift/optionset/TestSwiftOptionSetType.py

@@ -14,6 +14,7 @@
 
 lldbinline.MakeInlineTest(__file__, globals(),
                           decorators=[swiftTest,skipUnlessDarwin,
+        expectedFailureAll, #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
         expectedFailureAll(bugnumber="rdar://60396797",
                            setting=('symbols.use-swift-clangimporter', 'false'))
 ])

lldb/test/API/lang/swift/protocol_extension_computed_property/TestProtocolExtensionComputerProperty.py

@@ -4,6 +4,7 @@
 lldbinline.MakeInlineTest(
     __file__, globals(),
         decorators=[
+            expectedFailureAll, #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
             swiftTest,skipUnlessDarwin,
             skipIf(bugnumber="rdar://60396797", # should work but crashes.
                    setting=('symbols.use-swift-clangimporter', 'false'))

lldb/test/API/lang/swift/unknown_self/TestSwiftUnknownSelf.py

@@ -33,6 +33,7 @@ def check_class(self, var_self, broken):
         self.expect("fr v self", substrs=["hello", "world"])
 
 
+    @skipIf #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     @skipIf(bugnumber="SR-10216", archs=['ppc64le'])
     @swiftTest
     def test_unknown_self_objc_ref(self):

lldb/test/API/lang/swift/variables/error_type/TestSwiftErrorType.py

@@ -12,4 +12,7 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[
+#FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
+                          expectedFailureAll,
+                          swiftTest])

lldb/test/API/lang/swift/variables/protocol/TestSwiftProtocolTypes.py

@@ -23,6 +23,7 @@ class TestSwiftProtocolTypes(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
+    @expectedFailureAll #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     @swiftTest
     def test_swift_protocol_types(self):
         """Test support for protocol types"""