-LLC := ../tools/Debug/llc
-AS := ../tools/Debug/as
-LLCOPTS := -dsched y
+LEVEL = ..
+DIRS = Programs
+include Makefile.tests
-TESTS := $(wildcard *.ll)
+#
+# Make QMTest the default for testing features and regressions
+#
+all:: qmtest
-LLCTESTS := $(shell /bin/ls *.ll | grep -v testmemory | grep -v testswitch | grep -v sumarray )
+#
+# 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/QMTestDB
+QMCLASSES=$(LLVM_OBJ_ROOT)/test/QMTestDB/QMTest
-test all : testasmdis testopt testcodegen
- @echo "All tests successfully completed!"
+#
+# 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 make=$(MAKE)
-testasmdis : $(TESTS:%.ll=%.ll.asmdis)
- @echo "All assembler/disassembler test succeeded!"
+#
+# Location of the QMTest program.
+#
+QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
-testopt : $(TESTS:%.ll=%.ll.opt)
-testselect : $(LLCTESTS:%.ll=%.mc)
+#
+# Execute the tests
+#
+qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
+ $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT)
-testsched : $(LLCTESTS:%.ll=%.mc)
+%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
+ $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT) $*
-testcodegen : $(LLCTESTS:%.ll=%.mc)
+#
+# Create the temporary directory used by the test suite.
+#
+$(LLVM_OBJ_ROOT)/test/tmp::
+ ${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
-clean :
- rm -f *.[123] *.bc *.mc core
+#
+# 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.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 resource llvm.BytecodeResource
-%.asmdis: %
- @echo "Running assembler/disassembler test on $<"
- @./TestAsmDisasm.sh $<
-
-%.opt: %
- @echo "Running optimizier test on $<"
- @./TestOptimizer.sh $<
-
-%.bc: %.ll
- $(AS) $< -f
-
-%.mc: %.ll $(LLC) $(AS)
- @echo "Generating machine instructions for $<"
- $(AS) < $< | $(LLC) $(LLCOPTS) > $@
+#
+# Start up the QMTest GUI
+#
+gui::
+ $(QMTEST) gui --no-browser --daemon