Merged RELEASE_1.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9533 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Makefile b/test/Makefile
index 29f8236..3b98ef8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,13 +1,18 @@
LEVEL = ..
DIRS = Programs
-include Makefile.tests
#
# Make QMTest the default for testing features and regressions
+# Do this first to force QMTest to run first
#
all:: qmtest
#
+# 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.