X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=e2306dad5d02ff785ae1e39771ba7e8270312190;hb=c2c2009e2c9da175f293a8e053cd7b231deeb687;hp=cd05c29b9bc1864fc1b4a02050558e283f9c7b64;hpb=4a25494ee69a4b325ec54fd214a20a571b6ac387;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index cd05c29b9bc..e2306dad5d0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -28,7 +28,7 @@ RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
 endif
 
 check-local:: site.exp
-	PATH=$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+	PATH="$(LLVMToolDir):$(LLVMExmplDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
 	$(RUNTEST) $(RUNTESTFLAGS)
 
 clean::
@@ -44,12 +44,11 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
 	@echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp
 	@echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp
 	@echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp
-	@echo 'set llvmgcc "$(LLVMGCCWITHPATH)"' >> site.tmp
-	@echo 'set llvmgxx "$(LLVMGXXWITHPATH)"' >> site.tmp
+	@echo 'set llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
+	@echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
 	@echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
 	@test ! -f site.exp || \
 	sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
 	@-rm -f site.bak
 	@test ! -f site.exp || mv site.exp site.bak
 	@mv site.tmp site.exp
-