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

[oota-llvm.git] / test / Makefile.tests

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 91e466912d48f09fbbac35028744b448c4a5c2a6..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_ROOT_TOP)/tools/Release
-else
-TOOLS    = $(BUILD_ROOT_TOP)/tools/Debug
-endif
+TOOLS    = $(LLVMTOOLCURRENT)
 
 # LLVM Tool Definitions...
 #
@@ -57,20 +53,21 @@ 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  = /usr/dcs/software/supported/bin/gcc
+NATGCC  = $(CC)
 CP     = /bin/cp -f
 
 ## If TRACE or TRACEM is "yes", set the appropriate llc flag (-trace or -tracem)
 ## mark that tracing on, and set the TRACELIBS variable.
+TRACEFLAGS = 
 ifeq ($(TRACE), yes)
-    LLCFLAGS += -trace
+    TRACEFLAGS += -trace
     DOTRACING = yes
 else
     ifeq ($(TRACEM), yes)
-       LLCFLAGS += -tracem
+       TRACEFLAGS += -tracem
        DOTRACING = yes
     endif
 endif