Added a check for the -R linker option.

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 247450c923a4aefa422e26513da3cfc6e5357957..3b98ef8b98b1f9722f226ba9052e8a558b5a87f9 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,42 +1,90 @@
-LLVM := ..
-LLC  := $(LLVM)/tools/llc/llc
-AS   := $(LLVM)/tools/as/as
-LLCOPTS := -dsched t
+LEVEL  = ..
+DIRS   = Programs
 
-TESTS := $(wildcard *.ll)
+#
+# Make QMTest the default for testing features and regressions
+# Do this first to force QMTest to run first
+#
+all:: qmtest
 
-LLCTESTS := $(shell /bin/ls *.ll | grep -v testmemory | grep -v testswitch | grep -v sumarray)
+#
+# 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.
+#
 
-test all : testasmdis testopt testcodegen
-       @echo "All tests successfully completed!"
+# QMTest option specifying the location of the QMTest database.
+QMDB= -D $(LLVM_SRC_ROOT)/test
+QMCLASSES=$(LLVM_OBJ_ROOT)/test/QMTest
 
-testasmdis  : $(TESTS:%.ll=%.ll.asmdis)
-       @echo "All assembler/disassembler test succeeded!"
+#
+# 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)"
 
-testopt     : $(TESTS:%.ll=%.ll.opt)
+#
+# Location of the QMTest program.
+#
+QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
 
-testselect  : $(LLCTESTS:%.ll=%.mc)
 
-testsched   : $(LLCTESTS:%.ll=%.mc)
+#
+# Execute the tests
+#
+qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
+       -$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT)
 
-testcodegen : $(LLCTESTS:%.ll=%.mc)
+%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
+       -$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT) $*
 
-clean :
-       rm -f *.[123] *.bc *.mc core
+#
+# Create the temporary directory used by the test suite.
+#
+$(LLVM_OBJ_ROOT)/test/tmp::
+       ${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
 
-%.asmdis: %
-       @echo "Running assembler/disassembler test on $<"
-       @./TestAsmDisasm.sh $<
+#
+# 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
 
-%.opt: %
-       @echo "Running optimizier test on $<"
-       @./TestOptimizer.sh $<
+#
+# Start up the QMTest GUI
+#
+gui::
+       $(QMTEST) gui --no-browser --daemon
 
-%.bc: %.ll $(AS)
-       rm -f $@
-       $(AS) $<
+clean::
+       $(RM) -rf $(LLVM_OBJ_ROOT)/test/tmp
 
-%.mc: %.bc $(LLC)
-       @echo "Generating machine instructions for $<"
-       $(LLC) $(LLCOPTS) $< > $@