Checkin of autoconf-style object root.
Use QMTest for the feature and Regression tests.
Continue using the Makefile system for the Programs tests.
Adjusted the Makefile rules to handle building outside the source directory.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8381 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Makefile b/test/Makefile
index 5e916c5..df38927 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,8 +1,13 @@
LEVEL = ..
-DIRS = Feature Regression Programs
+DIRS = Programs
include Makefile.tests
#
+# Make QMTest the default for testing features and regressions
+#
+all:: qmtest
+
+#
# New QMTest functionality:
# The test suite is being transitioned over to QMTest. Eventually, it
# will use QMTest by default.
@@ -10,13 +15,7 @@
# List of the functioning QM Tests
QMTESTS=feature \
- regression.assembler \
- regression.analysis \
- regression.bugpoint \
- regression.cbackend \
- regression.jello \
- regression.linker \
- regression.other
+ regression
# QMTest option specifying the location of the QMTest database.
QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB
@@ -27,12 +26,13 @@
#
CONTEXT= -c srcroot=$(LLVM_SRC_ROOT) \
-c buildroot=$(LLVM_OBJ_ROOT) \
- -c buildtype=$(CONFIGURATION) \
+ -c buildtype=$(CONFIGURATION) \
-c tmpdir=$(LLVM_OBJ_ROOT)/test/tmp \
- -c cc=$(CC) \
- -c cxx=$(CXX) \
- -c "llvmgcc=$(LLVMGCC)" \
- -c make=$(MAKE)
+ -c coresize=0 \
+ -c cc=$(CC) \
+ -c cxx=$(CXX) \
+ -c "llvmgcc=$(LLVMGCC)" \
+ -c make=$(MAKE)
#
# Location of the QMTest program.