Compile the LLDB tests out-of-tree.

This patch is the result of a discussion on lldb-dev, see
http://lists.llvm.org/pipermail/lldb-dev/2018-January/013111.html for
background.

For each test (should be eventually: each test configuration) a
separate build directory is created and we execute

  make VPATH=$srcdir/path/to/test -C $builddir/path/to/test -f $srcdir/path/to/test/Makefile -I $srcdir/path/to/test

In order to make this work all LLDB tests need to be updated to find
the executable in the test build directory, since CWD still points at
the test's source directory, which is a requirement for unittest2.

Although we have done extensive testing, I'm expecting that this first
attempt will break a few bots. Please DO NOT HESITATE TO REVERT this
patch in order to get the bots green again. We will likely have to
iterate on this some more.

Differential Revision: https://reviews.llvm.org/D42281

llvm-svn: 323803

32 files changed, 81 insertions, 82 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile
index f8a04bd32b9..979cefe9b7f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile
@@ -1,18 +1,16 @@
 LEVEL := ../../../make
 
-LD_EXTRAS := -L. -l$(LIB_PREFIX)One -l$(LIB_PREFIX)Two
+LD_EXTRAS := -L. -LOne -l$(LIB_PREFIX)One -LTwo -l$(LIB_PREFIX)Two
 C_SOURCES := main.c
 
-main.o : CFLAGS_EXTRAS += -g -O0
-
 include $(LEVEL)/Makefile.rules
 
 .PHONY:
 a.out: lib_One lib_Two
 
 lib_%:
-	$(MAKE) -f $*.mk
+	$(MAKE) VPATH=$(SRCDIR)/$* -I $(SRCDIR) -f $(SRCDIR)/$*.mk
 
 clean::
-	$(MAKE) -f One.mk clean
-	$(MAKE) -f Two.mk clean
+	$(MAKE) -f $(SRCDIR)/One.mk clean
+	$(MAKE) -f $(SRCDIR)/Two.mk clean
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk
index 04f894c595e..eb68a402b1b 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk
@@ -1,12 +1,12 @@
 LEVEL := ../../../make
 
 DYLIB_NAME := One
-DYLIB_C_SOURCES := One/One.c One/OneConstant.c
+DYLIB_C_SOURCES := One.c OneConstant.c
 DYLIB_ONLY := YES
 
 include $(LEVEL)/Makefile.rules
 
 CFLAGS_EXTRAS += -fPIC
 
-One/OneConstant.o: One/OneConstant.c
+OneConstant.o: OneConstant.c
 	$(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
index 3ba4628e478..0fbf6725695 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
@@ -16,6 +16,11 @@ class TestConflictingSymbols(TestBase):
     mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
+    def setUp(self):
+        TestBase.setUp(self)
+        lldbutil.mkdir_p(self.getBuildArtifact("One"))
+        lldbutil.mkdir_p(self.getBuildArtifact("Two"))
+
     def test_conflicting_symbols(self):
         self.build()
         exe = self.getBuildArtifact("a.out")
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk
index 117d9e00d44..634fb1dc0fa 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk
@@ -1,12 +1,12 @@
 LEVEL := ../../../make
 
 DYLIB_NAME := Two
-DYLIB_C_SOURCES := Two/Two.c Two/TwoConstant.c
+DYLIB_C_SOURCES := Two.c TwoConstant.c
 DYLIB_ONLY := YES
 
 include $(LEVEL)/Makefile.rules
 
 CFLAGS_EXTRAS += -fPIC
 
-Two/TwoConstant.o: Two/TwoConstant.c
+TwoConstant.o: TwoConstant.c
 	$(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
index 0223858ca58..b76cd411b5c 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
@@ -29,10 +29,10 @@ class TlsGlobalTestCase(TestBase):
                     "=" +
                     os.environ["LD_LIBRARY_PATH"] +
                     ":" +
-                    os.getcwd())
+                    self.getBuildDir())
             else:
                 self.runCmd("settings set target.env-vars " +
-                            self.dylibPath + "=" + os.getcwd())
+                            self.dylibPath + "=" + self.getBuildDir())
             self.addTearDownHook(
                 lambda: self.runCmd(
                     "settings remove target.env-vars " +
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py b/lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py
index 8764f521130..4965df2d809 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py
@@ -40,9 +40,7 @@ class TestUnionMembers(TestBase):
     def _load_exe(self):
         self.build()
 
-        cwd = os.getcwd()
-
-        src_file = os.path.join(cwd, "main.c")
+        src_file = os.path.join(self.getSourceDir(), "main.c")
         self.src_file_spec = lldb.SBFileSpec(src_file)
         self.assertTrue(self.src_file_spec.IsValid(), "breakpoint file")
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
index 5cbcfdf9687..a344c4f7d18 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
@@ -18,9 +18,7 @@ class TestCppChainedCalls(TestBase):
         self.assertTrue(src_file_spec.IsValid(), "Main source file")
 
         # Get the path of the executable
-        cwd = os.getcwd()
-        exe_file = self.getBuildArtifact("a.out")
-        exe_path = os.path.join(cwd, exe_file)
+        exe_path = self.getBuildArtifact("a.out")
 
         # Load the executable
         target = self.dbg.CreateTarget(exe_path)
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
index 74b94517fa0..276794ca422 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
@@ -51,7 +51,7 @@ class CppValueCastTestCase(TestBase):
 
     def do_sbvalue_cast(self, exe_name):
         """Test SBValue::Cast(SBType) API for C++ types."""
-        exe = os.path.join(os.getcwd(), exe_name)
+        exe = self.getBuildArtifact(exe_name)
 
         # Create a target from the debugger.
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
index 866bae7f7d2..fa68d0a1502 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
@@ -20,7 +20,6 @@ class TestCppGlobalOperators(TestBase):
         self.assertTrue(src_file_spec.IsValid(), "Main source file")
 
         # Get the path of the executable
-        cwd = os.getcwd()
         exe_path = self.getBuildArtifact("a.out")
 
         # Load the executable
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/TestWithModuleDebugging.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/TestWithModuleDebugging.py
index 643dd2f81ff..b9f25537258 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/TestWithModuleDebugging.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/TestWithModuleDebugging.py
@@ -13,9 +13,8 @@ class TestWithGmodulesDebugInfo(TestBase):
     @add_test_categories(["gmodules"])
     def test_specialized_typedef_from_pch(self):
         self.build()
-        cwd = os.getcwd()
 
-        src_file = os.path.join(cwd, "main.cpp")
+        src_file = os.path.join(self.getSourceDir(), "main.cpp")
         src_file_spec = lldb.SBFileSpec(src_file)
         self.assertTrue(src_file_spec.IsValid(), "breakpoint file")
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile
index bea4bf96e60..2ce96e90d2d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile
@@ -19,16 +19,16 @@ nolimit: main.o length_nolimit.o a.o
 	$(CXX) main.o length_nolimit.o a.o -o nolimit $(LDFLAGS)
 
 main.o: main.cpp
-	$(CXX) $(CFLAGS_LIMIT) main.cpp -o main.o
+	$(CXX) $(CFLAGS_LIMIT) $(SRCDIR)/main.cpp -o main.o
 
 length_limit.o: length.cpp
-	$(CXX) $(CFLAGS_LIMIT) length.cpp -o length_limit.o
+	$(CXX) $(CFLAGS_LIMIT) $(SRCDIR)/length.cpp -o length_limit.o
 
 length_nolimit.o: length.cpp
-	$(CXX) $(CFLAGS_NO_LIMIT) length.cpp -o length_nolimit.o
+	$(CXX) $(CFLAGS_NO_LIMIT) $(SRCDIR)/length.cpp -o length_nolimit.o
 
 a.o: a.cpp
-	$(CXX) $(CFLAGS_NO_DEBUG) -c a.cpp -o a.o
+	$(CXX) $(CFLAGS_NO_DEBUG) -c $(SRCDIR)/a.cpp -o a.o
 
 clean: OBJECTS += limit nolimit length_limit.o length_nolimit.o length_limit.dwo length_nolimit.dwo
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
index 505a27a0a67..c7368a41a30 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
@@ -51,8 +51,7 @@ class TestCppIncompleteTypes(TestBase):
         self.assertTrue(src_file_spec.IsValid(), "Main source file")
 
         # Get the path of the executable
-        cwd = os.getcwd()
-        exe_path = os.path.join(cwd, exe)
+        exe_path = self.getBuildArtifact(exe)
 
         # Load the executable
         target = self.dbg.CreateTarget(exe_path)
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
index f7a3f91e158..ae50d3d3966 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
@@ -12,9 +12,7 @@ class TestWithLimitDebugInfo(TestBase):
     def test_limit_debug_info(self):
         self.build()
 
-        cwd = os.getcwd()
-
-        src_file = os.path.join(cwd, "main.cpp")
+        src_file = os.path.join(self.getSourceDir(), "main.cpp")
         src_file_spec = lldb.SBFileSpec(src_file)
         self.assertTrue(src_file_spec.IsValid(), "breakpoint file")
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile
index 0041add935a..9e52bacd5fc 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile
@@ -9,11 +9,11 @@ include $(LEVEL)/Makefile.rules
 a.out: lib_a lib_b
 
 lib_%:
-	$(MAKE) -f $*.mk
+	$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/$*.mk
 
 hidden_lib_d:
 	$(MAKE) -C hidden
 
 clean::
-	$(MAKE) -f a.mk clean
-	$(MAKE) -f b.mk clean
+	$(MAKE) -f $(SRCDIR)/a.mk clean
+	$(MAKE) -f $(SRCDIR)/b.mk clean
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
index b1e6e080be3..f42d194cd62 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
@@ -16,12 +16,11 @@ class TestCppNsImport(TestBase):
         self.build()
 
         # Get main source file
-        src_file = "main.cpp"
+        src_file = os.path.join(self.getSourceDir(), "main.cpp")
         src_file_spec = lldb.SBFileSpec(src_file)
         self.assertTrue(src_file_spec.IsValid(), "Main source file")
 
         # Get the path of the executable
-        cwd = os.getcwd()
         exe_path = self.getBuildArtifact("a.out")
 
         # Load the executable
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
index ba1e6bd06f9..5cd9e4ed1b4 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
@@ -23,12 +23,11 @@ class TestCppScopes(TestBase):
         self.build()
 
         # Get main source file
-        src_file = "main.cpp"
+        src_file = os.path.join(self.getSourceDir(), "main.cpp")
         src_file_spec = lldb.SBFileSpec(src_file)
         self.assertTrue(src_file_spec.IsValid(), "Main source file")
 
         # Get the path of the executable
-        cwd = os.getcwd()
         exe_path = self.getBuildArtifact("a.out")
 
         # Load the executable
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile
index 2d6de6f1514..346fc4b1fbc 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile
@@ -1,38 +1,23 @@
 LEVEL = ../../../make
 
-CC ?= clang
-ifeq "$(ARCH)" ""
-	ARCH = x86_64
-endif
+LD_EXTRAS = -lobjc -framework Foundation
 
-ifeq "$(OS)" ""
-	OS = $(shell uname -s)
-endif
+include $(LEVEL)/Makefile.rules
 
-CFLAGS ?= -g -O0
-
-ifeq "$(OS)" "Darwin"
-	CFLAGS += -arch $(ARCH)
-endif
-
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
-
-all: a.out libTest.dylib libTestExt.dylib
+all: a.out
 
 libTest.dylib:	Test/Test.m
-	$(CC) $(CFLAGS) -I. -c -o Test.o Test/Test.m
-	$(CC) $(LDFLAGS) -shared -o libTest.dylib Test.o
-	dsymutil libTest.dylib
+	mkdir -p Test
+	$(MAKE) MAKE_DSYM=YES VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/Test/Test.mk all
 
 libTestExt.dylib: TestExt/TestExt.m
-	$(CC) $(CFLAGS) -I. -c -o TestExt.o TestExt/TestExt.m
-	$(CC) $(LDFLAGS) -L. -lTest -shared -o libTestExt.dylib TestExt.o
-	dsymutil libTestExt.dylib
+	mkdir -p TestExt
+	$(MAKE) MAKE_DSYM=YES VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/TestExt/TestExt.mk all
 
 a.out: main.m libTest.dylib libTestExt.dylib
-	$(CC) $(LDFLAGS) -I. -L. -lTest -lTestExt -o a.out main.m 
-
-.PHONY: clean
+	$(CC) $(LDFLAGS) -I$(SRCDIR) -L. -lTest -lTestExt -o a.out $<
 
-clean:
-	rm -rf libTest.dylib libTestExt.dylib a.out Test.o TestExt.o libTest.dylib.dSYM libTest.dylib.dSYM
+clean::
+	rm -rf libTest.dylib libTestExt.dylib a.out Test.o TestExt.o libTest.dylib.dSYM libTestExt.dylib.dSYM
+	$(MAKE) MAKE_DSYM=YES VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/Test/Test.mk clean
+	$(MAKE) MAKE_DSYM=YES VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/TestExt/TestExt.mk clean
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk
new file mode 100644
index 00000000000..be758ac07d8
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk
@@ -0,0 +1,10 @@
+LEVEL = ../../../make
+
+DYLIB_NAME := Test
+DYLIB_ONLY := YES
+CFLAGS_EXTRAS = -I$(SRCDIR)/..
+LD_EXTRAS = -lobjc -framework Foundation
+
+DYLIB_OBJC_SOURCES = Test/Test.m
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk
new file mode 100644
index 00000000000..285d7262ce8
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk
@@ -0,0 +1,10 @@
+LEVEL = ../../../make
+
+DYLIB_NAME := TestExt
+DYLIB_ONLY := YES
+CFLAGS_EXTRAS = -I$(SRCDIR)/..
+LD_EXTRAS = -L. -lTest -lobjc -framework Foundation
+
+DYLIB_OBJC_SOURCES = TestExt/TestExt.m
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
index b432d47d36a..42535ca44af 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
@@ -296,7 +296,7 @@ class FoundationTestCase(TestBase):
         # Log any DWARF lookups
         ++file_index
         logfile = os.path.join(
-            os.getcwd(),
+            self.getBuildDir(),
             "dwarf-lookups-" +
             self.getArchitecture() +
             "-" +
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
index 8ef9f39434e..82e08584702 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
@@ -34,7 +34,7 @@ class ObjectDescriptionAPITestCase(TestBase):
         d = {'EXE': 'b.out'}
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        exe = os.path.join(os.getcwd(), 'b.out')
+        exe = self.getBuildArtifact('b.out')
 
         # Create a target by the debugger.
         target = self.dbg.CreateTarget(exe)
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
index 96ac6d7bd90..2fad51eefd5 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
@@ -84,10 +84,12 @@ class HiddenIvarsTestCase(TestBase):
 
         if strip:
             self.assertTrue(subprocess.call(
-                ['/usr/bin/strip', '-Sx', 'libInternalDefiner.dylib']) == 0, 'stripping dylib succeeded')
-            self.assertTrue(subprocess.call(['/bin/rm',
-                                             '-rf',
-                                             'libInternalDefiner.dylib.dSYM']) == 0,
+                ['/usr/bin/strip', '-Sx',
+                 self.getBuildArtifact('libInternalDefiner.dylib')]) == 0,
+                            'stripping dylib succeeded')
+            self.assertTrue(subprocess.call(
+                ['/bin/rm', '-rf',
+                 self.getBuildArtifact('libInternalDefiner.dylib.dSYM')]) == 0,
                             'remove dylib dSYM file succeeded')
             self.assertTrue(subprocess.call(['/usr/bin/strip', '-Sx',
                                              self.getBuildArtifact("a.out")
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile
index bd940ab148c..f69da9a64be 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile
@@ -19,8 +19,8 @@ endif
 all: aout
 
 aout: 
-	$(CC) $(CFLAGS_NO_DEBUG) myclass.m -c -o myclass.o
-	$(CC) $(CFLAGS) myclass.o repro.m -framework Foundation
+	$(CC) $(CFLAGS_NO_DEBUG) $(SRCDIR)/myclass.m -c -o myclass.o
+	$(CC) $(CFLAGS) myclass.o $(SRCDIR)/repro.m -framework Foundation
 
 clean::
 	rm -f myclass.o
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
index ad182586f78..c6c556d385d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -47,7 +47,7 @@ class IncompleteModulesTestCase(TestBase):
 
         self.runCmd(
             "settings set target.clang-module-search-paths \"" +
-            os.getcwd() +
+            self.getSourceDir() +
             "\"")
 
         self.expect("expr @import myModule; 3", VARIABLES_DISPLAYED_CORRECTLY,
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
index 2b2f51918cb..29d386253fb 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
@@ -50,7 +50,7 @@ class ModulesInlineFunctionsTestCase(TestBase):
 
         self.runCmd(
             "settings set target.clang-module-search-paths \"" +
-            os.getcwd() +
+            self.getSourceDir() +
             "\"")
 
         self.expect("expr @import myModule; 3", VARIABLES_DISPLAYED_CORRECTLY,
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
index 8b3f444b27a..6e95b4fa4b9 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
@@ -34,7 +34,7 @@ class ObjCDynamicSBTypeTestCase(TestBase):
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
 
-        exe = os.path.join(os.getcwd(), self.exe_name)
+        exe = self.getBuildArtifact(self.exe_name)
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
index 4365ed9ae93..b93a8a13379 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
@@ -3,7 +3,7 @@ LEVEL = ../../../make
 OBJC_SOURCES := main.m
 LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
 
-default:        a.out.stripped
+all:        a.out.stripped
 
 a.out.stripped: a.out.dSYM
 	strip -o a.out.stripped a.out
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
index 288f912dc79..57a572c6bb4 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
@@ -38,7 +38,7 @@ class PrintObjTestCase(TestBase):
         d = {'EXE': 'b.out'}
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        exe = os.path.join(os.getcwd(), 'b.out')
+        exe = self.getBuildArtifact('b.out')
 
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
index fe7d5d48ca7..737b0dc3286 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
@@ -33,7 +33,7 @@ class MethodReturningBOOLTestCase(TestBase):
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
 
-        exe = os.path.join(os.getcwd(), self.exe_name)
+        exe = self.getBuildArtifact(self.exe_name)
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
index 1375a78f87a..ed60e5f98c2 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
@@ -33,7 +33,7 @@ class Rdar10967107TestCase(TestBase):
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
 
-        exe = os.path.join(os.getcwd(), self.exe_name)
+        exe = self.getBuildArtifact(self.exe_name)
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
index d1956d46e7b..8619ce1ebd3 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
@@ -33,7 +33,7 @@ class Rdar10967107TestCase(TestBase):
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
 
-        exe = os.path.join(os.getcwd(), self.exe_name)
+        exe = self.getBuildArtifact(self.exe_name)
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
index 28f230107fd..00fffc8176a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
@@ -41,7 +41,7 @@ class Rdar12408181TestCase(TestBase):
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
 
-        exe = os.path.join(os.getcwd(), self.exe_name)
+        exe = self.getBuildArtifact(self.exe_name)
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(