Make TestSwiftResilience a more realistic approximation of real-world code.

This patch changes the test to build a resilient dylib, put a binary
.swiftmodule into the dylib's debug info, vend a textual
.swiftinterface to the main application. It's unrealistic to assume
that the main application would be built against an out-of-date binary
.swiftmodule.

Author: adrian-prantl

lldb/test/API/lang/swift/resilience/Makefile

@@ -12,15 +12,16 @@ libmod.%.dylib: mod.%.swift
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 	mv libmod.dylib $@
 	mv libmod.dylib.dSYM $@.dSYM || true
-	mv mod.swiftmodule mod.$*.swiftmodule
+	rm mod.swiftmodule
+	mv mod.swiftinterface mod.$*.swiftinterface
 	mv mod.o mod.$*.o
 	rm mod.swift mod.partial.swiftmodule
 
 main.%: main.swift
 	ln -sf libmod.$*.dylib libmod.dylib
 	ln -sf libmod.$*.dylib.dSYM libmod.dylib.dSYM
 	ln -sf mod.$*.swiftdoc mod.swiftdoc
-	ln -sf mod.$*.swiftmodule mod.swiftmodule
+	ln -sf mod.$*.swiftinterface mod.swiftinterface
 	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/exe.mk all

lldb/test/API/lang/swift/resilience/TestSwiftResilience.py

@@ -28,27 +28,34 @@ class TestSwiftResilience(TestBase):
 
     @skipUnlessDarwin
     @swiftTest
+    # Because we rename the .swiftmodule files after building the
+    # N_AST symbol table entry is out of sync, whereas dsymutil
+    # captures the right one before the rename.
+    @skipIf(debug_info=no_match(["dsym"]))
     def test_cross_module_extension_a_a(self):
         """Test that LLDB can debug across resilient boundaries"""
         self.build()
         self.doTestWithFlavor("a", "a")
 
     @skipUnlessDarwin
     @swiftTest
+    @skipIf(debug_info=no_match(["dsym"]))
     def test_cross_module_extension_a_b(self):
         """Test that LLDB can debug across resilient boundaries"""
         self.build()
         self.doTestWithFlavor("a", "b")
 
     @skipUnlessDarwin
     @swiftTest
+    @skipIf(debug_info=no_match(["dsym"]))
     def test_cross_module_extension_b_a(self):
         """Test that LLDB can debug across resilient boundaries"""
         self.build()
         self.doTestWithFlavor("b", "a")
 
     @skipUnlessDarwin
     @swiftTest
+    @skipIf(debug_info=no_match(["dsym"]))
     def test_cross_module_extension_b_b(self):
         """Test that LLDB can debug across resilient boundaries"""
         self.build()
@@ -66,7 +73,7 @@ def createSymlinks(self, exe_flavor, mod_flavor):
         execute_command("ln -sf " + self.getBuildArtifact("libmod." + exe_flavor + ".dylib.dSYM") + " " + self.getBuildArtifact("libmod.dylib.dSYM"))
         execute_command("ln -sf " + self.getBuildArtifact("mod." + exe_flavor + ".o") + " " + self.getBuildArtifact("mod.o"))
 
-        execute_command("ln -sf " + self.getBuildArtifact("mod." + exe_flavor + ".swiftmodule") + " " + self.getBuildArtifact("mod.swiftmodule"))
+        execute_command("ln -sf " + self.getBuildArtifact("mod." + exe_flavor + ".swiftinterface") + " " + self.getBuildArtifact("mod.swiftinterface"))
 
     def cleanupSymlinks(self):
         execute_command(