Removed the AnalyzeTest class.

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index b555cc8e3bb3771ca798f912fe106d488444c70e..5483e9ca5eba60fb385c5e46899c53119844e0c5 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,8 +14,8 @@ all:: qmtest
 #
 
 # QMTest option specifying the location of the QMTest database.
-QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB
-QMCLASSES=$(LLVM_OBJ_ROOT)/test/QMTestDB/QMTest
+QMDB= -D $(LLVM_SRC_ROOT)/test
+QMCLASSES=$(LLVM_OBJ_ROOT)/test/QMTest
 
 #
 # This is configuration information used by the test suite.  In QM Test, it's
@@ -29,6 +29,7 @@ CONTEXT= -c srcroot=$(LLVM_SRC_ROOT) \
          -c cc=$(CC) \
          -c cxx=$(CXX) \
          -c "llvmgcc=$(LLVMGCC)" \
+         -c "llvmgxx=$(LLVMGXX)" \
          -c make=$(MAKE)
 
 #
@@ -41,10 +42,10 @@ 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 $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT)
 
 %.t:: $(LLVM_OBJ_ROOT)/test/tmp register
-       $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT) $*
+       $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT) $*
 
 #
 # Create the temporary directory used by the test suite.
@@ -65,14 +66,13 @@ register:
        $(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
@@ -80,3 +80,6 @@ register:
 gui::
        $(QMTEST) gui --no-browser --daemon
 
+clean::
+       $(RM) -rf $(LLVM_OBJ_ROOT)/test/tmp
+