LEVEL = ..
DIRS = Programs
-include Makefile.tests
#
# 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
#
# QMTest option specifying the location of the QMTest database.
-QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB
+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
+
+ifeq ($(OS),SunOS)
+QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.sunos.qmr
+endif
#
# 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) \
+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)
+ -c "llvmgxx=$(LLVMGXX)" \
+ -c "make=$(MAKE)"
#
# Location of the QMTest program.
#
-QMTEST= qmtest $(QMDB)
+QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
#
# Execute the tests
#
qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
- $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT)
+ -$(QMTEST) run -O $(QMEXPECT) $(CONTEXT)
%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
- $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT) $*
+ -$(QMTEST) run -O $(QMEXPECT) $(CONTEXT) $*
#
# Create the temporary directory used by the test suite.
${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
#
-# Register the python code with QMTest
+# 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.
#
-register:: $(LLVM_SRC_ROOT)/test/QMTestDB/QMTest/llvm.pyo
-
-$(LLVM_SRC_ROOT)/test/QMTestDB/QMTest/llvm.pyo: $(LLVM_SRC_ROOT)/test/QMTestDB/QMTest/llvm.py
+# 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
+ $(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