Merge commit 'ccbec21b9f6d' from swift/release/5.3 into swift/master

Author: git apple-llvm automerger

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

@@ -825,10 +825,12 @@ endif
 $(DYLIB_FILENAME) : $(DYLIB_OBJECTS)
 	@echo "### Linking dynamic library $(DYLIB_NAME)"
 ifneq "$(EXCLUDE_WRAPPED_SWIFTMODULE)" ""
-	$(SWIFTC) $(patsubst -g,,$(SWIFTFLAGS)) -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ \
+	$(SWIFTC) $(patsubst -g,,$(SWIFTFLAGS)) -toolchain-stdlib-rpath \
+            -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ \
             $(patsubst %.swiftmodule.o,,$^)
 else
-	$(SWIFTC) $(patsubst -g,,$(SWIFTFLAGS)) -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ $^
+	$(SWIFTC) $(patsubst -g,,$(SWIFTFLAGS)) -toolchain-stdlib-rpath \
+            -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ $^
 endif
 ifneq "$(CODESIGN)" ""
 	$(CODESIGN) -s - "$(DYLIB_FILENAME)"

lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py

@@ -93,10 +93,3 @@ def test_any_type(self):
         # the inout type appears as direct.
         self.check_variable("in_struct", False, 12345)
 
-        
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/any/TestSwiftAnyType.py

@@ -40,9 +40,3 @@ def test_any_type(self):
 
         self.expect("expression -d run -- q", substrs=['12'])
         self.expect("frame variable -d run -- q", substrs=['12'])
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/any_object/TestSwiftAnyObjectType.py

@@ -55,9 +55,3 @@ def test_any_object_type(self):
             use_dynamic=False,
             value='12',
             typename="Swift.Int")
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py

@@ -120,9 +120,3 @@ def test_swift_archetype_resolution(self):
         self.assertTrue(var_x.GetValue() == 'A', "GE case fails")
         if self.TraceOn():
             self.runCmd("frame variable -d run")
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py

@@ -51,9 +51,3 @@ def test_swift_associated_type_resolution(self):
                             (i, var.GetError().GetCString()))
             value = child.GetValueAsUnsigned()
             self.assertEqual(value, i, "Wrong value: %d not %d."%(value, i))
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/backwards_compatibility/simple/TestSwiftBackwardsCompatibilitySimple.py

@@ -45,8 +45,3 @@ def test_simple(self):
         # FIXME: This doesn't work.
         #self.expect("fr v generic", substrs=['-1'])
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/break_by_partial_name/TestSwiftBreakByPartialName.py

@@ -55,9 +55,3 @@ def break_commands(self):
         self.runCmd("continue", RUN_SUCCEEDED)
 
         self.expect("frame select 0", substrs=['Accumulator', 'incr'])
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/bt_printing/TestSwiftBacktracePrinting.py

@@ -58,8 +58,3 @@ def do_test(self):
                                    'arg1=12', 'arg2="Hello world"'])
         self.expect("breakpoint set -p other", substrs=['g<U, T>'])
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py

@@ -55,9 +55,3 @@ def test(self):
                     substrs=['(dylib.C<a.Wrapper>.Something)', "hello"])
         self.assertTrue(os.path.isdir(mod_cache), "module cache exists")
 
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py

@@ -81,9 +81,3 @@ def testSwiftDebugMacros(self):
         self.assertTrue(space == 1)
         self.assertTrue(space_with_space == 0)
         self.assertTrue(ndebug == 1)
-        
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

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

@@ -65,10 +65,3 @@ def test(self):
         self.assertTrue((not value.GetError().Success()) or
                          not value.GetSummary())
         self.runCmd("settings set symbols.use-swift-dwarfimporter true")
-      
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py

@@ -64,10 +64,3 @@ def test(self):
         self.assertTrue((not value.GetError().Success()) or
                          not value.GetSummary())
         self.runCmd("settings set symbols.use-swift-dwarfimporter true")
-        
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/macro_conflict/TestSwiftMacroConflict.py

@@ -93,9 +93,3 @@ def test_with_dwarfimporter(self):
         self.expect("v foo", substrs=["42"])
         self.assertTrue(os.path.isdir(mod_cache), "module cache exists")
         lldb.SBDebugger.MemoryPressureDetected()
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/TestSwiftObjCMainConflictingDylibs.py

@@ -71,9 +71,3 @@ def test(self):
         self.expect("p baz", "correct baz", substrs=["i_am_from_Foo"])
         self.expect("fr var baz", "correct baz", substrs=["i_am_from_Foo"])
 
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py

@@ -60,9 +60,3 @@ def test(self):
         self.expect("p foo", "expected result", substrs=["23"])
         self.expect("p $R6", "expected result", substrs=["23"])
         self.expect("p $R8", "expected result", substrs=["23"])
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py

@@ -76,8 +76,3 @@ def test(self):
         self.expect("p $R6", "expected result", substrs=["23"])
         self.expect("p $R8", "expected result", substrs=["23"])
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

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

@@ -50,9 +50,3 @@ def testSwiftRemoteASTImport(self):
                     substrs=['(Library.LibraryProtocol) $R0'])
         self.expect("expr -d run-target -- input",
                     substrs=['(a.FromMainModule) $R2'])
-        
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py

@@ -130,9 +130,3 @@ def dotest(self, remap):
             self.assertEqual(found_ovl, 2)
         else:
             self.assertTrue(errs > 0, "expected module import error")
-        
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py

@@ -16,7 +16,6 @@
 import lldbsuite.test.lldbutil as lldbutil
 import os
 import unittest2
-import shutil
 
 class TestSwiftStaticArchiveTwoSwiftmodules(TestBase):
 
@@ -56,9 +55,3 @@ def test(self):
         process.Continue()
         self.expect("fr var bar", "expected result", substrs=["42"])
         self.expect("p bar", "expected result", substrs=["j", "42"])
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/conditional_breakpoints/TestSwiftConditionalBreakpoint.py

@@ -63,8 +63,3 @@ def break_commands(self):
 
         self.check_x_and_y(threads[0].frames[0], '3', '1')
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/cross_module_extension/TestSwiftCrossModuleExtension.py

@@ -60,8 +60,3 @@ def test_cross_module_extension(self):
         lldbutil.check_variable(self, var, False, typename="moda.S.A")
         lldbutil.check_variable(self, child_v, False, value="3")
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/different_clang_flags/TestSwiftDifferentClangFlags.py

@@ -83,8 +83,3 @@ def test_swift_different_clang_flags(self):
         var = self.frame().EvaluateExpression("fA()")
         lldbutil.check_variable(self, var, False, value="2")
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/dwarfimporter/BridgingPCH/TestSwiftDWARFImporterBridgingPCH.py

@@ -63,9 +63,3 @@ def test_dwarf_importer(self):
         process.Clear()
         target.Clear()
         lldb.SBDebugger.MemoryPressureDetected()
-       
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/dynamic_value/TestSwiftDynamicValue.py

@@ -79,9 +79,3 @@ def dynamic_val_commands(self):
                 ".Base = {",
                 "v = 449493530",
                 "q = 3735928559"])
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/access_control/TestExpressionAccessControl.py

@@ -49,8 +49,3 @@ def test_swift_expression_access_control(self):
             self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
         self.check_expression("foo.m_a", "3", use_summary=False)
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/classes/fromobjc/TestSwiftExpressionsInMethodsFromObjc.py

@@ -54,8 +54,3 @@ def test_swift_expressions_from_objc(self):
         self.check_expression("m_ivar", "10", use_summary=False)
         self.check_expression("self.m_ivar == 11", "false")
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/classes/pureswift/TestSwiftExpressionsInMethodsPureSwift.py

@@ -50,8 +50,3 @@ def test_expressions_in_methods(self):
         self.check_expression("m_ivar", "10", use_summary=False)
         self.check_expression("self.m_ivar == 11", "false")
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/equality_operators/TestEqualityOperators.py

@@ -126,8 +126,3 @@ def do_test(self, bkpt_name, compare_value, counter_value):
             value.GetSummary() == "false",
             "1 == 2 didn't return false.")
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/errors/TestExpressionErrors.py

@@ -130,8 +130,3 @@ def do_test(self):
             "Expected 'Over 100', got %s" %
             (message.GetSummary()))
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/exclusivity_suppression/TestExclusivitySuppression.py

@@ -100,8 +100,3 @@ def check_expression(self, frame, expression, expected_result, use_summary=True)
         self.assertTrue(answer == expected_result, report_str)
 
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/generic/TestSwiftGenericExpressions.py

@@ -133,8 +133,3 @@ def do_ivar_test(self):
 
             self.runCmd("continue")
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/no_calculator/TestSwiftNoProcess.py

@@ -60,8 +60,3 @@ def test_swift_no_process(self):
                         "Swift expressions with no process should fail.")
 
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()

lldb/test/API/lang/swift/expression/objc_context/Makefile

@@ -1,15 +1,13 @@
-SWIFT_OBJC_INTEROP := 1
+OBJC_SOURCES := main.m
+CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(BUILDDIR)
+LD_EXTRAS = -lFoo -L$(BUILDDIR)
 
 # This test builds an Objective-C main program that imports two Swift
 # .dylibs with conflicting ClangImporter search paths.
 
-include Makefile.rules
+all: libFoo.dylib $(EXE)
 
-a.out: main.m libFoo.dylib
-	$(CC) $(CFLAGS) $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(shell pwd) -lFoo -L$(shell pwd) -o $@ $<
-ifneq "$(CODESIGN)" ""
-	$(CODESIGN) -s - "$@"
-endif
+include Makefile.rules
 
 lib%.dylib: %.swift
 	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \

lldb/test/API/lang/swift/expression/objc_context/TestSwiftExpressionObjCContext.py

@@ -16,7 +16,6 @@
 import lldbsuite.test.lldbutil as lldbutil
 import os
 import unittest2
-import shutil
 
 class TestSwiftExpressionObjCContext(TestBase):
 
@@ -29,20 +28,12 @@ def setUp(self):
     @swiftTest
     def test(self):
         self.build()
-        exe_name = "a.out"
-        exe = self.getBuildArtifact(exe_name)
-
-        # Create the target
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
 
         # Register shlib so it can run on-device.
+        target,  _, _, _ = lldbutil.run_to_source_breakpoint(
+            self, "break here", lldb.SBFileSpec('main.m'))
         self.registerSharedLibrariesWithTarget(target, ['Foo'])
 
-        # Set the breakpoints
-        foo_breakpoint = target.BreakpointCreateBySourceRegex(
-            'break here', lldb.SBFileSpec('main.m'))
-        process = target.LaunchSimple(None, None, os.getcwd())
         # This is expected to fail because we can't yet import ObjC
         # modules into a Swift context.
         self.expect("expr -lang Swift -- Bar()", "failure",
@@ -51,10 +42,4 @@ def test(self):
         self.expect("expr -lang Swift -- [1, 2, 3]",
                     "context-less swift expression works",
                     substrs=["([Int])"])
-        
 
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()