-LLC := ../tools/Debug/llc
-LAS := ../tools/Debug/as
-LDIS := ../tools/Debug/dis
-LINK := ../tools/Debug/link
-LLCLIBS := runtime.o
-LLCOPTS :=
-
-ifeq ($(TRACE), yes)
- LLCOPTS := -trace
+LEVEL = ..
+DIRS = Programs
+
+#
+# Make QMTest the default for testing features and regressions
+# Do this first to force QMTest to run first
+#
+all:: qmtest
+
+#
+# Include other test rules
+#
+include Makefile.tests
+
+#
+# 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
+
+#
+# Determine which expectations file we will use
+#
+QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.unknown.qmr
+ifeq ($(OS),Linux)
+QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.linux.qmr
endif
-CC = /opt/SUNWspro/bin/cc
-AS = /opt/SUNWspro/bin/cc
-DIS = /usr/ccs/bin/dis
-CFLAGS = -g -xarch=v9
-CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS)
-ASFLAGS = -c $(CFLAGS)
-
-
-TESTS := $(wildcard *.ll)
-
-LLCTESTS := $(shell /bin/ls *.ll | grep -v testswitch | grep -v opttest | grep -v xx | grep -v calltest | grep -v alloca | grep -v memory )
-
-
-test all : testasmdis testopt testcodegen
- @echo "All tests successfully completed!"
-
-testasmdis : $(TESTS:%.ll=%.ll.asmdis)
- @echo "All assembler/disassembler test succeeded!"
-
-testopt : $(TESTS:%.ll=%.ll.opt)
-
-testselect : $(LLCTESTS:%.ll=%.mc)
-
-testsched : $(LLCTESTS:%.ll=%.mc)
-
-testcodegen : $(LLCTESTS:%.ll=%.mc)
-
-testsparc : $(LLCTESTS:%.ll=%.s)
-
-clean :
- rm -f *.[123] *.bc *.mc *.s *.o a.out core
-
-%.asmdis: %
- @echo "Running assembler/disassembler test on $<"
- @./TestAsmDisasm.sh $<
-
-%.opt: %
- @echo "Running optimizier test on $<"
- @./TestOptimizer.sh $<
-
-%.bc: %.ll $(LAS)
- $(LAS) -f $<
-
-%.mc: %.bc $(LLC) $(AS)
- @echo "Generating machine instructions for $<"
- $(LLC) -dsched y $(LLCOPTS) $< > $@
-
-%.trace.bc: %.bc $(LLC)
- $(LLC) -f -trace $(LLCOPTS) $<
-
-%.s: %.bc $(LLC)
- $(LLC) -f $(LLCOPTS) $<
-
-%: %.o $(LLCLIBS)
- $(CC) -o $@ $(LDFLAGS) $< $(LLCLIBS)
-
-
-## Cancel built-in implicit rule that overrides the above rule
-%: %.s
-
-## The next two rules are for disassembling an executable or an object file
-%.dis: %
- $(DIS) $< > $@
+ifeq ($(OS),SunOS)
+QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.sunos.qmr
+endif
-%.dis: %.o
- $(DIS) $< > $@
+#
+# 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)"
+
+#
+# Location of the QMTest program.
+#
+QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
+
+
+#
+# Execute the tests
+#
+qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
+ -$(QMTEST) run -O $(QMEXPECT) $(CONTEXT)
+
+%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
+ -$(QMTEST) run -O $(QMEXPECT) $(CONTEXT) $*
+
+#
+# Create the temporary directory used by the test suite.
+#
+$(LLVM_OBJ_ROOT)/test/tmp::
+ ${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
+
+#
+# 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.CTest
+ $(QMTEST) register test llvm.CXXTest
+ $(QMTEST) register database llvmdb.llvmdb
+
+# Start up the QMTest GUI
+gui::
+ $(QMTEST) gui --no-browser --daemon
+
+# Also get rid of qmtest garbage when we 'make clean' in this directory.
+clean:: qmtest-clean
+
+qmtest-clean:
+ $(RM) -rf $(LLVM_OBJ_ROOT)/test/tmp
+ $(RM) -f $(LLVM_SRC_ROOT)/test/QMTest/*.pyo \
+ $(LLVM_OBJ_ROOT)/test/QMTest/*.pyo
+ $(RM) -f $(LLVM_SRC_ROOT)/test/results.qmr \
+ $(LLVM_OBJ_ROOT)/test/results.qmr