Fixed the location of the expectations file.

Added the registration of the LLVM Database class.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8946 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index e0dee956813ea66e8e3660ed13f774f879363e81..be22e17a040abf99925c84a2a9746192d45eff3b 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -42,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/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/expectations.qmr $(CONTEXT) $*
+       $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT) $*
 
 #
 # Create the temporary directory used by the test suite.
@@ -74,6 +74,7 @@ register:
        $(QMTEST) register test llvm.AnalyzeTest
        $(QMTEST) register test llvm.CTest
        $(QMTEST) register test llvm.CXXTest
+       $(QMTEST) register database llvmdb.llvmdb
        $(QMTEST) register resource llvm.BytecodeResource
 
 #