From 246fcca3181d2881bc6fb5190b0f54403269688e Mon Sep 17 00:00:00 2001
From: John Criswell <criswell@uiuc.edu>
Date: Mon, 16 Jun 2003 19:16:32 +0000
Subject: [PATCH] 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
---
 test/Makefile.tests | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 630bacfb9f1..22796116d96 100644
--- 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)