From d184c67b52aa1fbe825866545086bdd88e0b9c5f Mon Sep 17 00:00:00 2001
From: John Criswell <criswell@uiuc.edu>
Date: Mon, 27 Oct 2003 17:46:42 +0000
Subject: [PATCH] Merged RELEASE_1.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9533 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/BugPoint/misopt-basictest.ll | 3 ++-
 test/Makefile                     | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/BugPoint/misopt-basictest.ll b/test/BugPoint/misopt-basictest.ll
index 1ba9adb82b8..76363dfb1f6 100644
--- 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"
diff --git a/test/Makefile b/test/Makefile
index 29f823666a8..3b98ef8b98b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,12 +1,17 @@
 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
-- 
2.34.1