X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=5ecc4a227c5214bbfdfac40a960ae843b723168e;hb=db9654e284a8493db7ddf66ddd0c089d1eff7b85;hp=eae84ebdc050d7af89d6320ef88ec6d7bf7456ac;hpb=9fd50e2e380f785b4a61468f6a39779850f3b8d8;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index eae84ebdc05..5ecc4a227c5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,86 +1,71 @@
-LEVEL  = ..
-DIRS   = Programs
-include Makefile.tests
-
-#
-# Make QMTest the default for testing features and regressions
-#
-all:: qmtest
-
-#
-# New QMTest functionality:
-#	The test suite is being transitioned over to QMTest.  Eventually, it
-#	will use QMTest by default.
-#
-
-# QMTest option specifying the location of the QMTest database.
-QMDB= -D $(LLVM_SRC_ROOT)/test
-QMCLASSES=$(LLVM_OBJ_ROOT)/test/QMTest
+#===- 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.
+# 
+#===------------------------------------------------------------------------===#
 
-#
-# This is configuration information used by the test suite.  In QM Test, it's
-# called a 'context.'
-#
-CONTEXT= -c srcroot=$(LLVM_SRC_ROOT) \
-         -c buildroot=$(LLVM_OBJ_ROOT) \
-         -c buildtype=$(CONFIGURATION) \
-         -c tmpdir=$(LLVM_OBJ_ROOT)/test/tmp \
-         -c coresize=0 \
-         -c cc=$(CC) \
-         -c cxx=$(CXX) \
-         -c "llvmgcc=$(LLVMGCC)" \
-         -c "llvmgxx=$(LLVMGXX)" \
-         -c make=$(MAKE)
+LEVEL  = ..
+DIRS   = 
 
 #
-# Location of the QMTest program.
+# Make Dejagnu the default for testing
 #
-QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
+all:: check-local
 
+# Include other test rules
+include Makefile.tests
 
-#
-# Execute the tests
-#
-qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
-	$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT)
+#===------------------------------------------------------------------------===#
+# DejaGNU testing support
+#===------------------------------------------------------------------------===#
 
-%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
-	$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT) $*
+ifdef TESTSUITE
+CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
+CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
+RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
+endif
 
-#
-# Create the temporary directory used by the test suite.
-#
-$(LLVM_OBJ_ROOT)/test/tmp::
-	${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
+ifndef RUNLLVM2CPP
+RUNTESTFLAGS += --ignore llvm2cpp.exp
+endif
 
-#
-# Right now, QMTest compiles the python test classes and put them into the
-# source tree.  Since Python bytecode is *not* cross-platform compatible (I
-# think), we'll regenerate every time.
-#
-# Simultaneous builds won't work, but shared source trees will.
-#
-register:
-	$(QMTEST) register test llvm.TestAsmDisasm
-	$(QMTEST) register test llvm.AssembleTest
-	$(QMTEST) register test llvm.ConvertToCTest
-	$(QMTEST) register test llvm.LLToCTest
-	$(QMTEST) register test llvm.MachineCodeTest
-	$(QMTEST) register test llvm.TestOptimizer
-	$(QMTEST) register test llvm.LLITest
-	$(QMTEST) register test llvm.TestRunner
-	$(QMTEST) register test llvm.VerifierTest
-	$(QMTEST) register test llvm.AnalyzeTest
-	$(QMTEST) register test llvm.CTest
-	$(QMTEST) register test llvm.CXXTest
-	$(QMTEST) register database llvmdb.llvmdb
-
-#
-# Start up the QMTest GUI
-#
-gui::
-	$(QMTEST) gui --no-browser --daemon
+ifneq ($(RUNTEST),)
+check-local:: site.exp
+	( ulimit -t 600 ; ulimit -d 512000 ; \
+	  PATH="$(LLVMToolDir):$(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
 
 clean::
-	$(RM) -rf $(LLVM_OBJ_ROOT)/test/tmp
+	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test -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 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 'set gxxcmd "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts)"' >> 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