Reorder the PATH used during testing so $(ToolDir) and the LLVM

scripts dir appear before the user path.
 - This is an attempt to pick up the right executables. We should
   probably be substituting the exact things we want for clang a la
   the LLVM test script.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@55105 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index fb1ccfc4b6b80b46de35aa6864f9b41f5109a434..9fdc6113ffe57c1de2010f018dade260732044c2 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,7 +23,7 @@ TESTS := $(addprefix Output/, $(addsuffix .testresults, $(shell find $(TESTDIRS)
 
 Output/%.testresults: %
        @ $(PROGRESS)
-       @ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts VG=$(VG) $(PROJ_SRC_DIR)/TestRunner.sh $< > $@ || $(REPORTFAIL)
+       @ PATH=$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$$PATH VG=$(VG) $(PROJ_SRC_DIR)/TestRunner.sh $< > $@ || $(REPORTFAIL)
 
 all::
        @ mkdir -p $(addprefix Output/, $(TESTDIRS))