summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.printf/mixed_outb.exp
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/systemtap.printf/mixed_outb.exp')
-rw-r--r--testsuite/systemtap.printf/mixed_outb.exp8
1 files changed, 1 insertions, 7 deletions
diff --git a/testsuite/systemtap.printf/mixed_outb.exp b/testsuite/systemtap.printf/mixed_outb.exp
index 6d352dd4..6f591c45 100644
--- a/testsuite/systemtap.printf/mixed_outb.exp
+++ b/testsuite/systemtap.printf/mixed_outb.exp
@@ -3,13 +3,7 @@ set TEST_NAME "$subdir/mixed_outb"
if {![installtest_p]} { untested $TEST_NAME; return }
-# 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/../runtime/staprun/stap_merge.tcl"
-if (![file executable $stap_merge_path]) {
- catch {exec which stap_merge} stap_merge_path
-}
+set stap_merge_path "$srcdir/$subdir/stap_merge.tcl"
if (![file executable $stap_merge_path]) {
fail "$TEST_NAME : could not find stap_merge"
return