Fix PR1355: Only compute the SUBPATH and TESTDIR once.

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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index c49cedd5cf897e1ec76f29d2f247967024bd2378..ad9f2eabc7f1448143f2028dbc2e4c1648e5a4b6 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -37,9 +37,8 @@ endif
 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
 
 LLCLIBS := $(LLCLIBS) -lm
@@ -50,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.