X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=e2306dad5d02ff785ae1e39771ba7e8270312190;hb=ae232e7a1055033436370c0b3aecf054fa44d5e7;hp=4934e414e3b51ef7fa9c894858e7d1226adf9204;hpb=cf8a5f899b9d5ed7a37c45084ef85751d8c7ce05;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index 4934e414e3b..e2306dad5d0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,32 +1,54 @@
-TESTS := $(wildcard *.ll)
-
-SELECTTESTS := $(shell /bin/ls *.ll | grep -v testmemory | grep -v testswitch")
-
-test all : testasmdis testopt
-	@echo "All tests successfully completed!"
-
-testasmdis : $(TESTS:%.ll=%.ll.asmdis)
-	@echo "All assembler/disassembler test succeeded!"
-
-testopt : $(TESTS:%.ll=%.ll.opt)
-
-testselect : $(SELECTTESTS:%.ll=%.mc)
-
-clean :
-	rm -f *.[123] *.bc *.mc core
-
-%.asmdis: %
-	@echo "Running assembler/disassembler test on $<"
-	@./TestAsmDisasm.sh $<
-
-%.opt: %
-	@echo "Running optimizier test on $<"
-	@./TestOptimizer.sh $<
-
-%.bc: %.ll
-	rm -f $@
-	as $<
-
-%.mc: %.bc
-	@echo "Generating machine instructions for $<"
-	@llc -dselect y $< > $@
+#===- 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
+
+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