Merge pull request #195 from fredriss/cpp_exceptions_modernize

Modernize test and make it compatible with on-device testing

Author: fredriss

lldb/packages/Python/lldbsuite/test/repl/cpp_exceptions/CppLib/Makefile

@@ -1,28 +1,19 @@
-LEVEL = ../../make
-SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-CURDIR = $(shell pwd)
+SWIFT_SOURCES := main.swift
+SWIFTFLAGS_EXTRAS = -L$(BUILDDIR) -I$(BUILDDIR) -I$(SRCDIR) -lWrapper
+LD_EXTRAS = -Xlinker -rpath -Xlinker $(BUILDDIR)
 
-include $(LEVEL)/Makefile.rules
-
-a.out: main.swift libCppLib.dylib libWrapper.dylib
-	$(SWIFTC) $(SWIFTFLAGS) -Xlinker -rpath -Xlinker $(CURDIR) -I$(CURDIR) -lWrapper -L$(CURDIR) -o $@ $< \
-	    -toolchain-stdlib-rpath
-ifneq "$(CODESIGN)" ""
-	$(CODESIGN) -s - "$@"
-endif
+all: libWrapper.dylib a.out
 
+include Makefile.rules
 
 libCppLib.dylib: CppLib/CppLib.cpp
 	mkdir -p CppLib
-	$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/CppLib/Makefile
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		DYLIB_NAME=CppLib DYLIB_ONLY=YES CXXFLAGS_EXTRAS=-fPIC \
+		DYLIB_CXX_SOURCES="CppLib/CppLib.cpp CppLib/CppLibWrapper.cpp"
 	install_name_tool -id $@ $@
 
-libWrapper.dylib: wrapper.swift libCppLib.dylib
-	$(SWIFTC) $(SWIFTFLAGS) -emit-module -emit-library -module-link-name Wrapper -module-name Wrapper -o $@ -L$(CURDIR) -lCppLib -I$(SRCDIR)/CppLib -o $@ -Xlinker -install_name -Xlinker @executable_path/$@ $< \
-            -toolchain-stdlib-rpath
-ifneq "$(CODESIGN)" ""
-	$(CODESIGN) -s - "$@"
-endif
-
-clean::
-	rm -rf *.swiftmodule *.swiftdoc *.dSYM *~ lib*.dylib a.out *.o
+libWrapper.dylib: libCppLib.dylib
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		DYLIB_NAME=Wrapper DYLIB_SWIFT_SOURCES=wrapper.swift \
+		SWIFTFLAGS_EXTRAS="-I$(SRCDIR) -L. -lCppLib -module-link-name Wrapper"

lldb/packages/Python/lldbsuite/test/repl/cpp_exceptions/Makefile

@@ -42,6 +42,7 @@ def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
 
+    @decorators.skipIfRemote
     def do_repl_test(self):
         sdk_root = swift.getSwiftSDKRoot()
         build_dir = self.getBuildDir()
@@ -54,6 +55,17 @@ def do_repl_test(self):
         self.assertTrue("I called it successfully" in stdoutdata, "Didn't call call_cpp successfully: out: \n%s\nerr: %s"%(stdoutdata, stderrdata))
 
     def do_repl_mode_test(self):
+        target = self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
+        self.assertTrue(target, VALID_TARGET)
+        self.registerSharedLibrariesWithTarget(target, ['Wrapper'])
+
+        if lldb.remote_platform:
+            wd = lldb.remote_platform.GetWorkingDirectory()
+            filename = 'libCppLib.dylib'
+            err = lldb.remote_platform.Put(
+                lldb.SBFileSpec(self.getBuildArtifact(filename)),
+                lldb.SBFileSpec(os.path.join(wd, filename)))
+            self.assertFalse(err.Fail(), 'Failed to copy ' + filename)
         (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(self,
                                    "Set a breakpoint here", self.main_source_file)