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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index d24b7870b28..b2e53006bf0 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,9 +1,9 @@
-##-----------------------------------------------------------*-Makefile-*-
+##----------------------------------------------------------*- Makefile -*-===##
+##
 ## Common rules for generating, linking, and compiling via LLVM.  This is
 ## used to implement a robust testing framework for LLVM
-##------------------------------------------------------------------------
-
-## NOTE: This is preliminary and will change in the future
+##
+##-------------------------------------------------------------------------===##
 
 # If the user specified a TEST= option on the command line, we do not want to do
 # the default testing type.  Instead, we change the default target to be the
@@ -13,6 +13,9 @@ ifdef TEST
 test::
 endif
 
+# We do not want to make .d files for tests! 
+DISABLE_AUTO_DEPENDENCIES=1
+
 include ${LEVEL}/Makefile.common
 
 # Specify ENABLE_STATS on the command line to enable -stats and -time-passes
@@ -21,7 +24,6 @@ ifdef ENABLE_STATS
 STATS = -stats -time-passes
 endif
 
-
 .PHONY: clean default
 
 # These files, which might be intermediate results, should not be deleted by
@@ -32,99 +34,30 @@ 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
-
-# LLVM Tool Definitions...
-#
-LCC      = $(LLVMGCCDIR)/bin/llvm-gcc
-LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/llvm/3.1/cc1
-LLI      = $(TOOLS)/lli
-LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/as
-LGCCAS   = $(TOOLS)/gccas
-LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/llvm/lib
-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 = $(LEVEL)/test/TestRunner.sh
-
-# Native Tool Definitions
-NATGCC  = /usr/dcs/software/supported/bin/gcc
-CP	= /bin/cp -f
-
-ifndef DISABLE_LLC_DIFFS
-CC      = /opt/SUNWspro/bin/cc
-AS	= /opt/SUNWspro/bin/cc
-DIS     = /usr/ccs/bin/dis
-CFLAGS  += -g -xarch=v9
-endif
-
-
-ifeq ($(TRACE), yes)
-    LLCFLAGS += -trace basicblock
-    LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
-else
-    ifeq ($(TRACEM), yes)
-	LLCFLAGS += -trace function
-	LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
-    endif
-endif
+TESTRUNR = @echo Running test: $<; \
+             PATH="$(LLVMTOOLCURRENT):$(PATH)" \
+                  $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
 LLCLIBS := $(LLCLIBS) -lm
 
 clean::
-	$(RM) a.out core
+	$(RM) -f a.out core
 	$(RM) -rf Output/
 
-# Compile from X.c to Output/X.ll
-Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
-	$(LCC) $(LCCFLAGS) -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 $@
-
-# Compile a linked program to machine code for this processor.
-#
-Output/%.llc.s: Output/%.llvm.bc $(LLC)
-	$(LLC) $(LLCFLAGS) -f $< -o $@
-
-# Assemble (and link) an LLVM-linked program using the system assembler...
-#
-Output/%.llc: Output/%.llc.s
-	$(CC) $(CFLAGS) $< $(LLCLIBS) -o $@
-
-#
-# Testing versions of provided utilities...
-#
-Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
-	@echo "======== Compiling $<"
-	$(LCC) $(LCCFLAGS) -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