6 files changed, 50 insertions, 10 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index dab33bab..fe918786 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-20  Martin Hunt  <hunt@redhat.com>
+
+	* systemtap.printf/*b.exp: Add code to look in the
+	toplevel directory for stap_merge.
+
 2007-06-18  Martin Hunt  <hunt@redhat.com>
 	 From Quentin Barnes.
 	* lib/stap_run.exp, lib/stap_run2.exp, lib/systemtap.exp,
diff --git a/testsuite/systemtap.printf/end1b.exp b/testsuite/systemtap.printf/end1b.exp
index 7ceb9384..2820cdd0 100644
--- a/testsuite/systemtap.printf/end1b.exp
+++ b/testsuite/systemtap.printf/end1b.exp
@@ -3,8 +3,15 @@ set TEST_NAME "$subdir/end1b"
 
 if {![installtest_p]} { untested $TEST_NAME; return }
 
-if {[catch {exec which stap_merge} stap_merge_path]} {
-    untested "$TEST_NAME : could not find stap_merge"
+# Look for stap_merge in the toplevel build directory
+# and if that fails, use "which" to try to find a copy
+# in the path.
+set stap_merge_path "$srcdir/../stap_merge"
+if (![file executable $stap_merge_path]) {
+    catch {exec which stap_merge} stap_merge_path
+}
+if (![file executable $stap_merge_path]) {
+    FAIL "$TEST_NAME : could not find stap_merge"
     return
 }
 
diff --git a/testsuite/systemtap.printf/mixed_outb.exp b/testsuite/systemtap.printf/mixed_outb.exp
index d6442787..c5e0bb9b 100644
--- a/testsuite/systemtap.printf/mixed_outb.exp
+++ b/testsuite/systemtap.printf/mixed_outb.exp
@@ -3,8 +3,15 @@ set TEST_NAME "$subdir/mixed_outb"
 
 if {![installtest_p]} { untested $TEST_NAME; return }
 
-if {[catch {exec which stap_merge} stap_merge_path]} {
-    untested "$TEST_NAME : could not find stap_merge"
+# Look for stap_merge in the toplevel build directory
+# and if that fails, use "which" to try to find a copy
+# in the path.
+set stap_merge_path "$srcdir/../stap_merge"
+if (![file executable $stap_merge_path]) {
+    catch {exec which stap_merge} stap_merge_path
+}
+if (![file executable $stap_merge_path]) {
+    FAIL "$TEST_NAME : could not find stap_merge"
     return
 }
 
diff --git a/testsuite/systemtap.printf/out1b.exp b/testsuite/systemtap.printf/out1b.exp
index dafdeb27..6fe89484 100644
--- a/testsuite/systemtap.printf/out1b.exp
+++ b/testsuite/systemtap.printf/out1b.exp
@@ -3,8 +3,15 @@ set TEST_NAME "$subdir/out1b"
 
 if {![installtest_p]} { untested $TEST_NAME; return }
 
-if {[catch {exec which stap_merge} stap_merge_path]} {
-    untested "$TEST_NAME : could not find stap_merge"
+# Look for stap_merge in the toplevel build directory
+# and if that fails, use "which" to try to find a copy
+# in the path.
+set stap_merge_path "$srcdir/../stap_merge"
+if (![file executable $stap_merge_path]) {
+    catch {exec which stap_merge} stap_merge_path
+}
+if (![file executable $stap_merge_path]) {
+    FAIL "$TEST_NAME : could not find stap_merge"
     return
 }
 
diff --git a/testsuite/systemtap.printf/out2b.exp b/testsuite/systemtap.printf/out2b.exp
index 9b8eed25..f7a1e332 100644
--- a/testsuite/systemtap.printf/out2b.exp
+++ b/testsuite/systemtap.printf/out2b.exp
@@ -3,8 +3,15 @@ set TEST_NAME "$subdir/out2b"
 
 if {![installtest_p]} { untested $TEST_NAME; return }
 
-if {[catch {exec which stap_merge} stap_merge_path]} {
-    untested "$TEST_NAME : could not find stap_merge"
+# Look for stap_merge in the toplevel build directory
+# and if that fails, use "which" to try to find a copy
+# in the path.
+set stap_merge_path "$srcdir/../stap_merge"
+if (![file executable $stap_merge_path]) {
+    catch {exec which stap_merge} stap_merge_path
+}
+if (![file executable $stap_merge_path]) {
+    FAIL "$TEST_NAME : could not find stap_merge"
     return
 }
 
diff --git a/testsuite/systemtap.printf/out3b.exp b/testsuite/systemtap.printf/out3b.exp
index 7692c65f..6d73d49f 100644
--- a/testsuite/systemtap.printf/out3b.exp
+++ b/testsuite/systemtap.printf/out3b.exp
@@ -3,8 +3,15 @@ set TEST_NAME "$subdir/out3b"
 
 if {![installtest_p]} { untested $TEST_NAME; return }
 
-if {[catch {exec which stap_merge} stap_merge_path]} {
-    untested "$TEST_NAME : could not find stap_merge"
+# Look for stap_merge in the toplevel build directory
+# and if that fails, use "which" to try to find a copy
+# in the path.
+set stap_merge_path "$srcdir/../stap_merge"
+if (![file executable $stap_merge_path]) {
+    catch {exec which stap_merge} stap_merge_path
+}
+if (![file executable $stap_merge_path]) {
+    FAIL "$TEST_NAME : could not find stap_merge"
     return
 }