X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile.tests;h=ad9f2eabc7f1448143f2028dbc2e4c1648e5a4b6;hb=52974eb49a18324e3897b749dce97c44e0ac65d3;hp=0e3a76901adaa8e5a87e582777ee1903961d4fcd;hpb=a5b567516fffe0a850f5b08eaf4cd940d32ebea0;p=oota-llvm.git

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 0e3a76901ad..ad9f2eabc7f 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -34,40 +34,13 @@ endif
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
-TOOLS    = $(LLVMTOOLCURRENT)
-
-# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
-LLI      = $(TOOLS)/lli
-LLC      = $(TOOLS)/llc
-LGCCAS   = $(TOOLS)/gccas
-LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
-LDIS     = $(TOOLS)/llvm-dis 
-LOPT     = $(TOOLS)/opt
-LLINK    = $(TOOLS)/llvm-link
-LANALYZE = $(TOOLS)/analyze
-LBUGPOINT= $(TOOLS)/bugpoint
-
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
-FAILURE  = $(LLVM_SRC_ROOT)/test/Failure.sh
 TESTRUNR = @echo Running test: $<; \
-             PATH=$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+             PATH="$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
                   $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
-## 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)
-    TRACEFLAGS = -trace
-    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr.$(ARCH)
-endif
-
-ifeq ($(TRACEM), yes)
-    TRACEFLAGS = -tracem
-    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr.$(ARCH)
-endif
-
 LLCLIBS := $(LLCLIBS) -lm
 
 clean::
@@ -76,15 +49,15 @@ clean::
 
 # Compile from X.c to Output/X.ll
 Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
-	-$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
+	-$(LLVMGCCWITHPATH) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
 
 # Compile from X.cpp to Output/X.ll
 Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+	-$(LLVMGXXWITHPATH) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # Compile from X.cc to Output/X.ll
 Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+	-$(LLVMGXXWITHPATH) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # LLVM Assemble from Output/X.ll to Output/X.bc.  Output/X.ll must have come
 # from GCC output, so use GCCAS.