-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
-
-#
-# 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)
-
+#===- test/Makefile ----------------------------------------*- Makefile -*--===#
+#
+# The LLVM Compiler Infrastructure
#
-# Location of the QMTest program.
-#
-QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
-
+# 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.
+#
+#===------------------------------------------------------------------------===#
-#
-# Execute the tests
-#
-qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
- $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/expectations.qmr $(CONTEXT)
-
-%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
- $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/expectations.qmr $(CONTEXT) $*
-
-#
-# Create the temporary directory used by the test suite.
-#
-$(LLVM_OBJ_ROOT)/test/tmp::
- ${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
+LEVEL = ..
+DIRS =
#
-# 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.
+# Make Dejagnu the default for testing
#
-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.AssemblyCodeTest
- $(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 resource llvm.BytecodeResource
+all:: check-local
-#
-# Start up the QMTest GUI
-#
-gui::
- $(QMTEST) gui --no-browser --daemon
+# 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):$(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