X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=e2306dad5d02ff785ae1e39771ba7e8270312190;hb=c2c2009e2c9da175f293a8e053cd7b231deeb687;hp=a9c7f75138e1a3249573e376c51d303c75d92b48;hpb=59a99604232c71a53fbe24b4b384722e9d9c0110;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index a9c7f75138e..e2306dad5d0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,79 +1,54 @@
-LLC  := ../tools/Debug/llc
-LAS  := ../tools/Debug/as
-LDIS := ../tools/Debug/dis 
-LINK := ../tools/Debug/link
-LLCLIBS := runtime.o
-LLCOPTS := 
-
-ifeq ($(TRACE), yes)
-    LLCOPTS := -trace
+#===- test/Makefile ----------------------------------------*- Makefile -*--===#
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file was developed by the LLVM research group and is distributed under
+# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
+
+LEVEL  = ..
+DIRS   = 
+
+#
+# Make Dejagnu the default for testing
+#
+all:: check-local
+
+# Include other test rules
+include Makefile.tests
+
+#===------------------------------------------------------------------------===#
+# DejaGNU testing support
+#===------------------------------------------------------------------------===#
+
+ifdef TESTSUITE
+CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
+RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
 endif
 
-CC      = /opt/SUNWspro/bin/cc
-AS	= /opt/SUNWspro/bin/cc
-DIS     = /usr/ccs/bin/dis
-CFLAGS  = -g -xarch=v9
-CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS)
-ASFLAGS = -c $(CFLAGS)
-
-
-TESTS := $(wildcard *.ll)
-
-LLCTESTS := $(shell /bin/ls *.ll | grep -v testswitch | grep -v opttest | grep -v xx | grep -v calltest | grep -v alloca | grep -v memory )
-
-
-test all : testasmdis testopt testcodegen
-	@echo "All tests successfully completed!"
-
-testasmdis  : $(TESTS:%.ll=%.ll.asmdis)
-	@echo "All assembler/disassembler test succeeded!"
-
-testopt     : $(TESTS:%.ll=%.ll.opt)
-
-testselect  : $(LLCTESTS:%.ll=%.mc)
-
-testsched   : $(LLCTESTS:%.ll=%.mc)
-
-testcodegen : $(LLCTESTS:%.ll=%.mc)
-
-testsparc   : $(LLCTESTS:%.ll=%.s)
-
-clean :
-	rm -f *.[123] *.bc *.mc *.s *.o a.out core 
-
-%.asmdis: %
-	@echo "Running assembler/disassembler test on $<"
-	@./TestAsmDisasm.sh $<
-
-%.opt: %
-	@echo "Running optimizier test on $<"
-	@./TestOptimizer.sh $<
-
-%.bc: %.ll $(LAS)
-	$(LAS) -f $<
-
-%.mc: %.bc $(LLC) $(AS)
-	@echo "Generating machine instructions for $<"
-	$(LLC) -dsched y $(LLCOPTS) $< > $@
-
-%.trace.bc: %.bc $(LLC)
-	$(LLC) -f -trace $(LLCOPTS) $<
-
-%.s: %.bc $(LLC)
-	$(LLC) -f $(LLCOPTS) $<
-
-%: %.o $(LLCLIBS)
-	$(CC) -o $@ $(LDFLAGS) $< $(LLCLIBS)
-
-
-## Cancel built-in implicit rule that overrides the above rule
-%: %.s
-
-## The next two rules are for disassembling an executable or an object file
-%.dis: %
-	$(DIS) $< > $@
-
-%.dis: %.o
-	$(DIS) $< > $@
-
+check-local:: site.exp
+	PATH="$(LLVMToolDir):$(LLVMExmplDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
+	$(RUNTEST) $(RUNTESTFLAGS)
+
+clean::
+	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Regression -name Output -type d -print`
+	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Feature -name Output -type d -print`
+
+site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
+	@echo 'Making a new site.exp file...'
+	@echo '## these variables are automatically generated by make ##' >site.tmp
+	@echo '# Do not edit here.  If you wish to override these values' >>site.tmp
+	@echo '# edit the last section' >>site.tmp
+	@echo "set target_triplet $(TARGET_TRIPLE)" >> site.tmp
+	@echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp
+	@echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp
+	@echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp
+	@echo 'set llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
+	@echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
+	@echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
+	@test ! -f site.exp || \
+	sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
+	@-rm -f site.bak
+	@test ! -f site.exp || mv site.exp site.bak
+	@mv site.tmp site.exp