Reconfigured the TOOLS variable so that it points to the current set of tools

built by the LLVM build.
Added a path for use with the TestRunner.sh script so that it can always find
the LLVM tools without having the user place them in his or her path.

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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 630bacfb9f1002350fd7287470d17fa63c08840b..22796116d96cf20dec033f5038d52ef844db96a1 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -30,11 +30,7 @@ endif
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
-ifdef ENABLE_OPTIMIZED
-TOOLS    = $(BUILD_OBJ_ROOT)/tools/Release
-else
-TOOLS    = $(BUILD_OBJ_ROOT)/tools/Debug
-endif
+TOOLS    = $(LLVMTOOLCURRENT)
 
 # LLVM Tool Definitions...
 #
@@ -57,7 +53,7 @@ LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
 FAILURE  = $(LEVEL)/test/Failure.sh
-TESTRUNR = $(LEVEL)/test/TestRunner.sh
+TESTRUNR = PATH=$(LLVMTOOLCURRENT) $(LEVEL)/test/TestRunner.sh
 
 # Native Tool Definitions
 NATGCC  = $(CC)