X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile.tests;h=c60c90c075d2440303bc21b825f5602639d66dfe;hb=c48b55a33dc5cd898dc9e58c0a1650b8f24c3879;hp=905531a8843273e42fd1bc4b176c2aecd0e0abb9;hpb=296a360dc5db9a23827291fbf90ccfe98f3c7fa9;p=oota-llvm.git

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 905531a8843..c60c90c075d 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,13 +1,29 @@
-##-----------------------------------------------------------*-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
+# test:: target.
+#
+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
+# output from gccas and gccld.
+ifdef ENABLE_STATS
+STATS = -stats -time-passes
+endif
+
 .PHONY: clean default
 
 # These files, which might be intermediate results, should not be deleted by
@@ -15,78 +31,45 @@ include ${LEVEL}/Makefile.common
 .PRECIOUS: Output/%.bc  Output/%.ll
 .PRECIOUS: Output/%.tbc Output/%.tll
 .PRECIOUS: Output/.dir
-
-# LLVM Tool Definitions...
-#
-LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCC1     = /home/vadve/lattner/cvs/gcc_install/lib/gcc-lib/llvm/3.1/cc1
-TOOLS    = $(LEVEL)/tools/Debug
-LLI      = $(TOOLS)/lli
-LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/as
-LGCCAS   = $(TOOLS)/gccas
-LDIS     = $(TOOLS)/dis 
-LOPT     = $(TOOLS)/opt
-LLINK    = $(TOOLS)/link
+.PRECIOUS: Output/%.llvm.bc
+.PRECIOUS: Output/%.llvm
 
 LCCFLAGS  += -O2 -Wall
+LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
-FAILURE  = $(LEVEL)/test/Failure.sh
+TESTRUNR = @echo Running test: $<; \
+             PATH="$(LLVMTOOLCURRENT):$(PATH)" \
+                  $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
-# Native Tool Definitions
-NATGCC  = /usr/dcs/software/supported/bin/gcc
-CC      = /opt/SUNWspro/bin/cc
-AS	= /opt/SUNWspro/bin/cc
-DIS     = /usr/ccs/bin/dis
-CP	= /bin/cp -f
-CFLAGS  += -g -xarch=v9
-
-LLCLIB   = $(LEVEL)/test/runtime.o
-LIBS    += $(LLCLIB)
-
-
-
-ifeq ($(TRACE), yes)
-    LLCFLAGS += -trace
-endif
-ifeq ($(TRACEM), yes)
-    LLCFLAGS += -tracem
-endif
+LLCLIBS := $(LLCLIBS) -lm
 
-clean ::
-	$(RM) a.out core
+clean::
+	$(RM) -f a.out core
 	$(RM) -rf Output/
 
-Output/%.ll: %.c $(LCC1) Output/.dir
-	$(LCC) $(LCCFLAGS) -S $< -o $@
+# Compile from X.c to Output/X.ll
+Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
+	-$(LLVMCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
 
-Output/%.bc: Output/%.ll $(LGCCAS)
-	$(LGCCAS) $< -o $@
+# Compile from X.cpp to Output/X.ll
+Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	-$(LLVMCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
-Output/%.bc: %.ll $(LAS)
-	$(LAS) $< -o $@
+# Compile from X.cc to Output/X.ll
+Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
+	-$(LLVMCXX) $(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.
 #
-# Testing versions of provided utilities...
-#
-Output/%.tll: %.c $(LCC1) Output/.dir
-	@echo "======== Compiling $<"
-	$(LCC) $(LCCFLAGS) -S $< -o $@ || \
-	    ( rm -f $@; $(FAILURE) $@ )
-
-Output/%.tbc: Output/%.tll $(LAS)
-	@echo "======== Assembling $<"
-	$(LAS) -f $< -o $@ || \
-            ( rm -f $@; $(FAILURE) $@ )
-
-
-
-#%.s: %.linked.bc
-#	$(LLC) -f $(LLCFLAGS) $< -o $@
-
-#%: %.o $(LIBS)
-#	$(CC) $(LDFLAGS) $< $(LIBS) -o $@
+Output/%.bc: Output/%.ll $(LGCCAS)
+	-$(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 $(LLVMAS) Output/.dir
+	-$(LLVMAS) $< -o $@
 
 ## Cancel built-in implicit rules that override above rules
 %: %.s
@@ -95,11 +78,3 @@ Output/%.tbc: Output/%.tll $(LAS)
 
 %.o: %.c
 
-## The next two rules are for disassembling an executable or an object file
-#%.dis: %
-#	$(DIS) $< > $@
-
-#%.dis: %.o
-#	$(DIS) $< > $@
-
-