X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile.tests;h=b2e53006bf08dba1163dd6d08a1a757d9993062c;hb=61b3d72ce4cc4cd1d3ff19dc03071642b8df7fb1;hp=d3e14c6e7f8488e2fde7e111fe6962a135524ee1;hpb=b8586b74a5a9b1a077f949dfcb58775a108f8619;p=oota-llvm.git

diff --git a/test/Makefile.tests b/test/Makefile.tests
index d3e14c6e7f8..b2e53006bf0 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -34,49 +34,12 @@ endif
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
-TOOLS    = $(LLVMTOOLCURRENT)
-
-# LLVM Tool Definitions...
-#
-LCC      = $(LLVMGCC)   ## FIXME: remove these definitions, use LLVMGCC directly
-LCXX     = $(LLVMGXX)   ## FIXME: remove these definitions, use LLVMGXX directly
-LAS      = $(LLVMAS)    ## FIXME: remove these definitions, use LLVMAS directly
-
-LLI      = $(TOOLS)/lli
-LLC      = $(TOOLS)/llc
-LGCCAS   = $(TOOLS)/gccas
-LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
-LGCCLDPROG = $(TOOLS)/gccld
-LDIS     = $(TOOLS)/dis 
-LOPT     = $(TOOLS)/opt
-LLINK    = $(TOOLS)/link
-LANALYZE = $(TOOLS)/analyze
-LBUGPOINT= $(TOOLS)/bugpoint
-
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
-FAILURE  = $(LEVEL)/test/Failure.sh
 TESTRUNR = @echo Running test: $<; \
-             PATH=$(LLVMTOOLCURRENT):$(LEVEL)/test/Scripts:$(PATH) \
-                  $(LEVEL)/test/TestRunner.sh
-
-# Native Tool Definitions
-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)
-    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
+             PATH="$(LLVMTOOLCURRENT):$(PATH)" \
+                  $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
 LLCLIBS := $(LLCLIBS) -lm
 
@@ -84,48 +47,17 @@ clean::
 	$(RM) -f a.out core
 	$(RM) -rf Output/
 
-# Compile from X.c to Output/X.ll
-Output/%.ll: $(SourceDir)%.c $(LCC1) Output/.dir $(INCLUDES)
-	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
-
-# Compile from X.cpp to Output/X.ll
-Output/%.ll: $(SourceDir)%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
-
-# Compile from X.cc to Output/X.ll
-Output/%.ll: $(SourceDir)%.cc $(LCC1XX) Output/.dir $(INCLUDES)
-	$(LCXX) $(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.
 #
 Output/%.bc: Output/%.ll $(LGCCAS)
-	$(LGCCAS) $(STATS) $< -o $@
+	-$(LGCCAS) $(STATS) $< -o $@
 
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
 # LLVM source, use the non-transforming assembler.
 #
-Output/%.bc: %.ll $(LAS) Output/.dir
-	$(LAS) -f $< -o $@
-
-#
-# Testing versions of provided utilities...
-#
-Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
-	@echo "======== Compiling $<"
-	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
-	    ( rm -f $@; $(FAILURE) $@ )
-
-Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-	@echo "======== Compiling $<"
-	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \
-	    ( rm -f $@; $(FAILURE) $@ )
-
-Output/%.tbc: Output/%.tll $(LAS)
-	@echo "======== Assembling $<"
-	$(LAS) -f $< -o $@ || \
-            ( rm -f $@; $(FAILURE) $@ )
-
+Output/%.bc: %.ll $(LLVMAS) Output/.dir
+	-$(LLVMAS) $< -o $@
 
 ## Cancel built-in implicit rules that override above rules
 %: %.s