The best unbreakage yet, addressing Bill's concerns.

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index b75762f5f140d85bbf88b09e82d02fdba204b779..593caafc8acf3281c09d02e74fb24617c42e1b3b 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,42 +1,70 @@
-LLVM := /home/vadve/vadve/Research/DynOpt/LLVM/llvm
-LLC  := $(LLVM)/tools/llc/llc
-AS   := $(LLVM)/tools/as/as
-LLCOPTS := -dsched t
+#===- 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.
+# 
+#===------------------------------------------------------------------------===#
 
-TESTS := $(wildcard *.ll)
+LEVEL  = ..
+DIRS   = 
 
-LLCTESTS := $(shell /bin/ls *.ll | grep -v testmemory | grep -v testswitch | grep -v sumarray)
+#
+# Make Dejagnu the default for testing
+#
+all:: check-local
 
+# Include other test rules
+include Makefile.tests
 
-test all : testasmdis testopt testcodegen
-       @echo "All tests successfully completed!"
+#===------------------------------------------------------------------------===#
+# DejaGNU testing support
+#===------------------------------------------------------------------------===#
 
-testasmdis  : $(TESTS:%.ll=%.ll.asmdis)
-       @echo "All assembler/disassembler test succeeded!"
+ifdef TESTSUITE
+CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
+CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
+RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
+endif
 
-testopt     : $(TESTS:%.ll=%.ll.opt)
+ifndef RUNLLVM2CPP
+RUNTESTFLAGS += --ignore llvm2cpp.exp
+endif
 
-testselect  : $(LLCTESTS:%.ll=%.mc)
+ifneq ($(RUNTEST),)
+check-local:: site.exp
+       PATH="$(LLVMToolDir):$(LLVMExmplDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
+       $(RUNTEST) $(RUNTESTFLAGS)
+else
+check-local:: site.exp
+       @echo "*** dejagnu not found.  Make sure runtest is in your PATH, then reconfigure llvm."
+endif
 
-testsched   : $(LLCTESTS:%.ll=%.mc)
+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`
 
-testcodegen : $(LLCTESTS:%.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 $(AS)
-       rm -f $@
-       $(AS) $<
-
-%.mc: %.bc $(LLC)
-       @echo "Generating machine instructions for $<"
-       $(LLC) $(LLCOPTS) $< > $@
+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 llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp
+       @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp
+       @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
+       @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
+       @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
+       @echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>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 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> 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