Merge pull request #3399 from adrian-prantl/test-cleanups

Test cleanups

Author: adrian-prantl

lldb/test/API/lang/swift/deployment_target/Makefile

@@ -1,26 +1,28 @@
-all: a.out dlopen_module
+all: libNewerTarget.dylib a.out dlopen_module
+
+SWIFT_SOURCES=main.swift
+SWIFTFLAGS_EXTRAS=-target x86_64-apple-macosx10.10 -Xfrontend -disable-target-os-checking -I$(BUILDDIR)
+LD_EXTRAS=-lNewerTarget -L$(BUILDDIR)
 
 include Makefile.rules
 
 # This test only works on macOS 10.11+.
 
 a.out: main.swift libNewerTarget.dylib
-	$(SWIFTC) -sdk "$(SWIFTSDKROOT)" -target x86_64-apple-macosx10.10 -g -Onone $^ -lNewerTarget -L$(shell pwd) -o $@ $(SWIFTFLAGS) -I$(shell pwd) -Xfrontend -disable-target-os-checking
-ifneq "$(CODESIGN)" ""
-	$(CODESIGN) -s - "$@"
-endif
 
-dlopen_module: main.m libNewerTarget.dylib
-	$(CC) -framework Foundation $^ -mmacos-version-min=10.8 -o $@ $(CFLAGS)
-ifneq "$(CODESIGN)" ""
-	$(CODESIGN) -s - "$@"
-endif
+dlopen_module: dlopen_module.m libNewerTarget.dylib
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		CXX= \
+		OBJC_SOURCES=dlopen_module.m \
+		EXE=dlopen_module \
+		LD_EXTRAS="-framework Foundation -mmacos-version-min=10.8"
 
 lib%.dylib: %.swift
-	$(SWIFTC) -sdk "$(SWIFTSDKROOT)" -target x86_64-apple-macosx10.11 -g -Onone $^ -emit-library -module-name $(shell basename $< .swift) -emit-module -Xlinker -install_name -Xlinker @executable_path/$@
-ifneq "$(CODESIGN)" ""
-	$(CODESIGN) -s - "$@"
-endif
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		DYLIB_ONLY=YES \
+		DYLIB_NAME=$(patsubst lib%.dylib,%,$@) \
+		DYLIB_SWIFT_SOURCES=$(patsubst lib%.dylib,%.swift,$@) \
+		SWIFTFLAGS_EXTRAS="-target x86_64-apple-macosx10.11"
 
 clean::
 	rm -rf *.swiftmodule *.swiftdoc *.dSYM *~ lib*.dylib a.out dlopen_module *.o

lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py

@@ -41,13 +41,15 @@ def test_swift_deployment_target(self):
     @skipIf(bugnumber="rdar://60396797", # should work but crashes.
             setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
-    @skipIfDarwinEmbedded # This test uses macOS triples explicitely.
+    @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
     @skipIf(macos_version=["<", "10.11"])
     @swiftTest
     def test_swift_deployment_target_dlopen(self):
         self.build()
-        lldbutil.run_to_source_breakpoint(
-            self, 'break here', lldb.SBFileSpec('NewerTarget.swift'),
-            exe_name="dlopen_module")
+        target, process, _, _, = lldbutil.run_to_name_breakpoint(
+            self, 'main', exe_name="dlopen_module")
+        bkpt = target.BreakpointCreateBySourceRegex(
+            'break here', lldb.SBFileSpec('NewerTarget.swift'))
+        lldbutil.continue_to_breakpoint(process, bkpt)
         self.expect("p self", substrs=['i = 23'])
 

lldb/test/API/lang/swift/deployment_target/dlopen_module.m

@@ -0,0 +1,18 @@
+#include <Foundation/Foundation.h>
+#include <dlfcn.h>
+#include <libgen.h>
+#include <limits.h>
+
+@protocol FooProtocol
+- (void)f;
+@end
+
+int main(int argc, const char **argv) {
+  char dylib[PATH_MAX];
+  strlcpy(dylib, dirname(argv[0]), PATH_MAX);
+  strlcat(dylib, "/libNewerTarget.dylib", PATH_MAX);
+  dlopen(dylib, RTLD_LAZY);
+  Class<FooProtocol> fooClass = NSClassFromString(@"NewerTarget.Foo");
+  [[[fooClass alloc] init] f];
+  return 0;
+}

lldb/test/API/lang/swift/deployment_target/main.m

@@ -1,10 +1,13 @@
 #include <dlfcn.h>
+#include <libgen.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include <libgen.h>
 
 int main(int argc, const char **argv) {
-  char *dylib_name = strcat(dirname(argv[0]),"/dylib.dylib");
+  char dylib_name[PATH_MAX];
+  strlcpy(dylib_name, dirname(argv[0]), PATH_MAX);
+  strlcat(dylib_name, "/dylib.dylib", PATH_MAX);
   void *dylib = dlopen(dylib_name, RTLD_NOW);
   void (*f)() = dlsym(dylib, "f");
   f();

lldb/test/API/lang/swift/late_dylib_clangdeps/loader.c

@@ -11,13 +11,15 @@
 //===----------------------------------------------------------------------===//
 
 #include <dlfcn.h>
+#include <libgen.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include <libgen.h>
 
-int main(int argc, const char **argv)
-{
-  char *dylib = strcat(dirname(argv[0]),"/UnitTest.xctest/Contents/MacOS/test");
+int main(int argc, const char **argv) {
+  char dylib[PATH_MAX];
+  strlcpy(dylib, dirname(argv[0]), PATH_MAX);
+  strlcat(dylib, "/UnitTest.xctest/Contents/MacOS/test", PATH_MAX);
   void *test_case = dlopen(dylib, RTLD_NOW);
 
   printf("%p\n", test_case); // Set breakpoint here