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

17 files changed, 66 insertions, 126 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile
index 3a363ab98c1..5abcf02738c 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile
@@ -13,10 +13,10 @@ ifeq "$(OS)" "Darwin"
 	CFLAGS += -arch $(ARCH)
 endif
 
-all: clean
+all: main.c clean
 	mkdir hide.app
 	mkdir hide.app/Contents
-	$(CC) $(CFLAGS) -g main.c
+	$(CC) $(CFLAGS) -g $<
 	mv a.out.dSYM hide.app/Contents
 	strip -x a.out
 
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile
index c75a079fe81..18a4934cca3 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile
@@ -1,3 +1,5 @@
+SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/
+
 CC ?= clang
 
 ifeq "$(ARCH)" ""
@@ -8,9 +10,12 @@ CFLAGS ?= -g -O0 -arch $(ARCH)
 
 all:  TestApp.app/Contents/MacOS/TestApp
 
-TestApp.app/Contents/MacOS/TestApp: 
-	$(CC) $(CFLAGS) -o TestApp main.c
+TestApp.app/Contents/MacOS/TestApp: $(SRCDIR)/main.c
+	$(CC) $(CFLAGS) -o TestApp $<
+	rm -rf TestApp.app
+	cp -r $(SRCDIR)/TestApp.app .
 	mv TestApp TestApp.app/Contents/MacOS/TestApp
 	mv TestApp.dSYM TestApp.app.dSYM
+
 clean:
 	rm -rf TestApp.app/Contents/MacOS/TestApp TestApp.app.dSYM
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestFindAppInBundle.py b/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestFindAppInBundle.py
index 90454f897c3..af6beeefd39 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestFindAppInBundle.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestFindAppInBundle.py
@@ -38,7 +38,7 @@ class FindAppInMacOSAppBundle(TestBase):
         # breakpoint, runs to it, and returns the thread, process & target.
         # It optionally takes an SBLaunchOption argument if you want to pass
         # arguments or environment variables.
-        exe = os.path.join(os.getcwd(), "TestApp.app")
+        exe = self.getBuildArtifact("TestApp.app")
         error = lldb.SBError()
         target = self.dbg.CreateTarget(exe, None, None, False, error)
         self.assertTrue(error.Success(), "Could not create target: %s"%(error.GetCString()))
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile
index 7b321e3deae..313c83e990d 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile
@@ -1,3 +1,5 @@
+SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/
+
 CC ?= clang
 
 ifeq "$(ARCH)" ""
@@ -7,7 +9,7 @@ endif
 CFLAGS ?= -g -O0 -arch $(ARCH)
 
 all: clean
-	$(CC) $(CFLAGS) -dynamiclib -o com.apple.sbd bundle.c
+	$(CC) $(CFLAGS) -dynamiclib -o com.apple.sbd $(SRCDIR)/bundle.c
 	mkdir com.apple.sbd.xpc
 	mv com.apple.sbd com.apple.sbd.xpc/
 	mkdir -p com.apple.sbd.xpc.dSYM/Contents/Resources/DWARF
@@ -15,7 +17,7 @@ all: clean
 	rm -rf com.apple.sbd.dSYM
 	mkdir hide.app
 	tar cf - com.apple.sbd.xpc com.apple.sbd.xpc.dSYM | ( cd hide.app;tar xBpf -)
-	$(CC) $(CFLAGS) -o find-bundle-with-dots-in-fn main.c
+	$(CC) $(CFLAGS) -o find-bundle-with-dots-in-fn $(SRCDIR)/main.c
 
 clean:
 	rm -rf a.out a.out.dSYM hide.app com.apple.sbd com.apple.sbd.dSYM com.apple.sbd.xpc com.apple.sbd.xpc.dSYM find-bundle-with-dots-in-fn find-bundle-with-dots-in-fn.dSYM
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
index 104e88752ec..9a046cf0b29 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
@@ -37,8 +37,9 @@ class BundleWithDotInFilenameTestCase(TestBase):
 
     def test_attach_and_check_dsyms(self):
         """Test attach to binary, see if the bundle dSYM is found"""
-        exe = os.path.join(os.getcwd(), exe_name)
+        exe = self.getBuildArtifact(exe_name)
         self.build()
+        os.chdir(self.getBuildDir());
         popen = self.spawnSubprocess(exe)
         self.addTearDownHook(self.cleanupSubprocesses)
 
@@ -66,6 +67,7 @@ class BundleWithDotInFilenameTestCase(TestBase):
                 dsym_name = mod.GetSymbolFileSpec().GetFilename()
                 self.assertTrue (dsym_name == 'com.apple.sbd', "Check that we found the dSYM for the bundle that was loaded")
             i=i+1
+        os.chdir(self.getSourceDir());
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile
index 33b09502378..d52d6f1f0d3 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile
@@ -1,3 +1,5 @@
+SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/
+
 CC ?= clang
 
 ifeq "$(ARCH)" ""
@@ -7,12 +9,12 @@ endif
 CFLAGS ?= -g -O0 -arch $(ARCH)
 
 all: clean
-	$(CC) $(CFLAGS) -install_name $(PWD)/MyFramework.framework/Versions/A/MyFramework -dynamiclib -o MyFramework myframework.c
+	$(CC) $(CFLAGS) -install_name $(shell pwd)/MyFramework.framework/Versions/A/MyFramework -dynamiclib -o MyFramework $(SRCDIR)/myframework.c
 	mkdir -p MyFramework.framework/Versions/A/Headers
 	mkdir -p MyFramework.framework/Versions/A/Resources
 	cp MyFramework MyFramework.framework/Versions/A
-	cp MyFramework.h MyFramework.framework/Versions/A/Headers
-	cp Info.plist MyFramework.framework/Versions/A/Resources
+	cp $(SRCDIR)/MyFramework.h MyFramework.framework/Versions/A/Headers
+	cp $(SRCDIR)/Info.plist MyFramework.framework/Versions/A/Resources
 	( cd MyFramework.framework/Versions ; ln -s A Current )
 	( cd MyFramework.framework/ ; ln -s Versions/Current/Headers . )
 	( cd MyFramework.framework/ ; ln -s Versions/Current/MyFramework . )
@@ -21,8 +23,8 @@ all: clean
 	mkdir hide.app
 	rm -f MyFramework
 	tar cf - MyFramework.framework MyFramework.framework.dSYM | ( cd hide.app;tar xBpf -)
-	$(CC) $(CFLAGS) -o deep-bundle main.c -F. -framework MyFramework
-	
+	$(CC) $(CFLAGS) -o deep-bundle $(SRCDIR)/main.c -F. -framework MyFramework
+
 
 clean:
 	rm -rf a.out a.out.dSYM deep-bundle deep-bundle.dSYM MyFramework.framework MyFramework.framework.dSYM MyFramework MyFramework.dSYM hide.app
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py
index 493c4b99d09..d6123e39c3f 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py
@@ -37,9 +37,9 @@ class DeepBundleTestCase(TestBase):
 
     def test_attach_and_check_dsyms(self):
         """Test attach to binary, see if the framework dSYM is found"""
-        exe = os.path.join(os.getcwd(), exe_name)
+        exe = self.getBuildArtifact(exe_name)
         self.build()
-        popen = self.spawnSubprocess(exe)
+        popen = self.spawnSubprocess(exe, [self.getBuildDir()])
         self.addTearDownHook(self.cleanupSubprocesses)
 
         # Give the inferior time to start up, dlopen a bundle, remove the bundle it linked in
@@ -49,7 +49,6 @@ class DeepBundleTestCase(TestBase):
         # binary & dSYM via target.exec-search-paths 
         settings_str = "settings set target.exec-search-paths " + self.get_process_working_directory() + "/hide.app"
         self.runCmd(settings_str)
-
         self.runCmd("process attach -p " + str(popen.pid))
 
         target = self.dbg.GetSelectedTarget()
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c
index 19715216d6c..b5ef5cff74a 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c
@@ -1,12 +1,17 @@
 #include <MyFramework/MyFramework.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 int setup_is_complete = 0;
 
-int main()
+int main(int argc, const char **argv)
 {
-    system ("/bin/rm -rf MyFramework MyFramework.framework MyFramework.framework.dSYM");
+    char command[8192];
+    sprintf (command,
+             "/bin/rm -rf %s/MyFramework %s/MyFramework.framework %s/MyFramework.framework.dSYM",
+             argv[1], argv[1], argv[1]);
+    system (command);
 
     setup_is_complete = 1;
 
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile
index 07aa39eac3b..69fd86e575e 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile
@@ -1,14 +1,6 @@
-CC ?= clang
-ifeq "$(ARCH)" ""
-	ARCH = x86_64
-endif
-
-ifeq "$(OS)" ""
-	OS = $(shell uname -s)
-endif
+LEVEL = ../../make
 
-CFLAGS ?= -g -O0
-CWD := $(shell pwd)
+include $(LEVEL)/Makefile.rules
 
 LIB_PREFIX := lib
 
@@ -28,21 +20,21 @@ all: a.out $(LIB_INDIRECT) $(LIB_REEXPORT)
 a.out: main.o $(LIB_INDIRECT) $(LIB_REEXPORT)
 	$(CC) $(CFLAGS) -o a.out main.o -L. $(LIB_INDIRECT) $(LIB_REEXPORT)
 
-main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
+main.o: $(SRCDIR)/main.c
+	$(CC) $(CFLAGS) -c $(SRCDIR)/main.c
 
 $(LIB_INDIRECT): indirect.o
 	$(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_INDIRECT) -o $(LIB_INDIRECT) indirect.o
 	if [ "$(OS)" = "Darwin" ]; then dsymutil $(LIB_INDIRECT); fi
 
-indirect.o: indirect.c
-	$(CC) $(CFLAGS) -c indirect.c
+indirect.o: $(SRCDIR)/indirect.c
+	$(CC) $(CFLAGS) -c $(SRCDIR)/indirect.c
 
 $(LIB_REEXPORT): reexport.o $(LIB_INDIRECT)
-	$(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_REEXPORT) -o $(LIB_REEXPORT) reexport.o -L. -lindirect -Wl,-alias_list,$(CWD)/alias.list
+	$(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_REEXPORT) -o $(LIB_REEXPORT) reexport.o -L. -lindirect -Wl,-alias_list,$(SRCDIR)/alias.list
 	if [ "$(OS)" = "Darwin" ]; then dsymutil $(LIB_REEXPORT); fi
 
-reexport.o: reexport.c
-	$(CC) $(CFLAGS) -c reexport.c
-clean:
+reexport.o: $(SRCDIR)/reexport.c
+	$(CC) $(CFLAGS) -c $(SRCDIR)/reexport.c
+clean::
 	rm -rf $(wildcard *.o *~ *.dylib *.so a.out *.dSYM)
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
index ee3d48d4552..a87a6289310 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
@@ -32,8 +32,8 @@ class TestIndirectFunctions(TestBase):
         self.assertTrue(target, VALID_TARGET)
 
         if self.platformIsDarwin():
-            lib1 = os.path.join(os.getcwd(), 'libindirect.dylib')
-            lib2 = os.path.join(os.getcwd(), 'libreexport.dylib')
+            lib1 = self.getBuildArtifact('libindirect.dylib')
+            lib2 = self.getBuildArtifact('libreexport.dylib')
             self.registerSharedLibrariesWithTarget(target, [lib1, lib2])
 
         self.main_source_spec = lldb.SBFileSpec(self.main_source)
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py b/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
index 999ab5e2491..2df2dc7b61b 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
@@ -111,7 +111,7 @@ class DarwinNSLogOutputTestCase(lldbtest.TestBase):
         self.build(dictionary=self.d)
         self.setTearDownCleanup(dictionary=self.d)
 
-        exe = os.path.join(os.getcwd(), self.exe_name)
+        exe = self.getBuildArtifact(self.exe_name)
         self.run_lldb_to_breakpoint(exe, self.source, self.line,
                                     settings_commands=settings_commands)
         self.expect_prompt()
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile
index 52fae2d2ca3..ff5f1886ef5 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile
@@ -1,7 +1,7 @@
 LEVEL = ../../make
 
 C_SOURCES := main.c
-LDFLAGS = $(CFLAGS) -Xlinker -order_file -Xlinker ./order-file
+LDFLAGS = $(CFLAGS) -Xlinker -order_file -Xlinker $(SRCDIR)/order-file
 MAKE_DSYM := NO
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile
index 93f2f7b2f34..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile
@@ -1,28 +1,5 @@
-CC ?= clang
-ifeq "$(ARCH)" ""
-	ARCH = x86_64
-endif
+LEVEL = ../../make
 
-ifeq "$(OS)" ""
-	OS = $(shell uname -s)
-endif
+C_SOURCES := main.c
 
-CFLAGS ?= -g -O0
-CWD := $(shell pwd)
-
-LIB_PREFIX := lib
-
-ifeq "$(OS)" "Darwin"
-	CFLAGS += -arch $(ARCH)
-endif
-
-all: a.out
-
-a.out: main.o
-	$(CC) $(CFLAGS) -o a.out main.o
-
-main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
-
-clean:
-	rm -rf $(wildcard *.o *~ *.dylib *.so a.out *.dSYM)
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile
index 93f2f7b2f34..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile
@@ -1,28 +1,5 @@
-CC ?= clang
-ifeq "$(ARCH)" ""
-	ARCH = x86_64
-endif
+LEVEL = ../../make
 
-ifeq "$(OS)" ""
-	OS = $(shell uname -s)
-endif
+C_SOURCES := main.c
 
-CFLAGS ?= -g -O0
-CWD := $(shell pwd)
-
-LIB_PREFIX := lib
-
-ifeq "$(OS)" "Darwin"
-	CFLAGS += -arch $(ARCH)
-endif
-
-all: a.out
-
-a.out: main.o
-	$(CC) $(CFLAGS) -o a.out main.o
-
-main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
-
-clean:
-	rm -rf $(wildcard *.o *~ *.dylib *.so a.out *.dSYM)
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile
index 93f2f7b2f34..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile
@@ -1,28 +1,5 @@
-CC ?= clang
-ifeq "$(ARCH)" ""
-	ARCH = x86_64
-endif
+LEVEL = ../../make
 
-ifeq "$(OS)" ""
-	OS = $(shell uname -s)
-endif
+C_SOURCES := main.c
 
-CFLAGS ?= -g -O0
-CWD := $(shell pwd)
-
-LIB_PREFIX := lib
-
-ifeq "$(OS)" "Darwin"
-	CFLAGS += -arch $(ARCH)
-endif
-
-all: a.out
-
-a.out: main.o
-	$(CC) $(CFLAGS) -o a.out main.o
-
-main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
-
-clean:
-	rm -rf $(wildcard *.o *~ *.dylib *.so a.out *.dSYM)
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
index 854c78ed8c2..d74ed26f50a 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
@@ -1,19 +1,21 @@
 CC ?= clang
 
+all: testit
+
 testit: testit.i386 testit.x86_64
-	lipo -create -o testit testit.i386 testit.x86_64
+	lipo -create -o testit $^
 
 testit.i386: testit.i386.o
-	$(CC) -arch i386 -o testit.i386 testit.i386.o
+	$(CC) -arch i386 -o testit.i386 $<
 
 testit.x86_64: testit.x86_64.o
-	$(CC) -arch x86_64 -o testit.x86_64 testit.x86_64.o
+	$(CC) -arch x86_64 -o testit.x86_64 $<
 
 testit.i386.o: main.c
-	$(CC) -g -O0 -arch i386 -c -o testit.i386.o main.c
+	$(CC) -g -O0 -arch i386 -c -o testit.i386.o $<
 
 testit.x86_64.o: main.c
-	$(CC) -g -O0 -arch x86_64 -c -o testit.x86_64.o main.c
+	$(CC) -g -O0 -arch x86_64 -c -o testit.x86_64.o $<
 
 clean:
 	rm -rf $(wildcard testit* *~)
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py b/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
index 9a690e3ebb0..ca4f3ce9b13 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
@@ -33,7 +33,7 @@ class UniversalTestCase(TestBase):
         self.build()
 
         # Note that "testit" is a universal binary.
-        exe = os.path.join(os.getcwd(), "testit")
+        exe = self.getBuildArtifact("testit")
 
         # Create a target by the debugger.
         target = self.dbg.CreateTargetWithFileAndTargetTriple(
@@ -57,7 +57,7 @@ class UniversalTestCase(TestBase):
         self.build()
 
         # Note that "testit" is a universal binary.
-        exe = os.path.join(os.getcwd(), "testit")
+        exe = self.getBuildArtifact("testit")
 
         # By default, x86_64 is assumed if no architecture is specified.
         self.expect("file " + exe, CURRENT_EXECUTABLE_SET,
@@ -130,7 +130,7 @@ class UniversalTestCase(TestBase):
         self.build()
 
         # Note that "testit" is a universal binary.
-        exe = os.path.join(os.getcwd(), "testit")
+        exe = self.getBuildArtifact("testit")
 
         # Create a target by the debugger.
         target = self.dbg.CreateTargetWithFileAndTargetTriple(