X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=ad9c6ecbd4783a3a9830f3e6fef1ac5735229761;hb=e07c2aa67cad10d6793c649639fece58dcea6d20;hp=516780f5b31ee25d6704925c4609a4a71ef00cb0;hpb=bb036be62020d9828f29930c83fca48000788493;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index 516780f5b31..ad9c6ecbd47 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,41 +1,107 @@
-LLC  := ../tools/Debug/llc
-AS   := ../tools/Debug/as
-LLCOPTS := -dsched y
+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!"
+#
+# 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
 
-testopt     : $(TESTS:%.ll=%.ll.opt)
+ifeq ($(OS),SunOS)
+QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.sunos.qmr
+endif
 
-testselect  : $(LLCTESTS:%.ll=%.mc)
+#
+# 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)"
 
-testsched   : $(LLCTESTS:%.ll=%.mc)
+#
+# Location of the QMTest program.
+#
+QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
 
-testcodegen : $(LLCTESTS:%.ll=%.mc)
 
-clean :
-	rm -f *.[123] *.bc *.mc core
+#
+# Execute the tests
+#
+qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
+	-$(QMTEST) run -O $(QMEXPECT) $(CONTEXT)
 
-%.asmdis: %
-	@echo "Running assembler/disassembler test on $<"
-	@./TestAsmDisasm.sh $<
+%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
+	-$(QMTEST) run -O $(QMEXPECT) $(CONTEXT) $*
 
-%.opt: %
-	@echo "Running optimizier test on $<"
-	@./TestOptimizer.sh $<
+#
+# Create the temporary directory used by the test suite.
+#
+$(LLVM_OBJ_ROOT)/test/tmp::
+	${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
 
-%.bc: %.ll
-	$(AS) $< -f
+#
+# 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
 
-%.mc: %.ll $(LLC) $(AS)
-	@echo "Generating machine instructions for $<"
-	$(AS) < $< | $(LLC) $(LLCOPTS) > $@
+# 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