Merged RELEASE_1.

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

diff --git a/test/BugPoint/misopt-basictest.ll b/test/BugPoint/misopt-basictest.ll
index 1ba9adb82b81c3a76ba99d7b63742f026b34dd73..76363dfb1f631167cacf6a62a352adb180a9ba32 100644 (file)
--- a/test/BugPoint/misopt-basictest.ll
+++ b/test/BugPoint/misopt-basictest.ll
@@ -1,4 +1,5 @@
-; RUN: export PATH=/usr/bin:/bin/:${PATH}
+; RUN: PATH=/usr/bin:/bin/:${PATH}
+; RUN: export PATH

 ; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg
 
 %.LC0 = internal global [13 x sbyte] c"Hello World\0A\00"
 ; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg
 
 %.LC0 = internal global [13 x sbyte] c"Hello World\0A\00"

diff --git a/test/Makefile b/test/Makefile
index 29f823666a88cef6cfba210de9a7cbe173211054..3b98ef8b98b1f9722f226ba9052e8a558b5a87f9 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,12 +1,17 @@
 LEVEL  = ..
 DIRS   = Programs
 LEVEL  = ..
 DIRS   = Programs

-include Makefile.tests

 
 #
 # Make QMTest the default for testing features and regressions
 
 #
 # Make QMTest the default for testing features and regressions

+# Do this first to force QMTest to run first

 #
 all:: qmtest
 
 #
 all:: qmtest
 

+#
+# Include other test rules
+#
+include Makefile.tests
+

 #
 # New QMTest functionality:
 #      The test suite is being transitioned over to QMTest.  Eventually, it
 #
 # New QMTest functionality:
 #      The test suite is being transitioned over to QMTest.  Eventually, it