From 2129d358c4aba84430a18f86309f2aa70a8fd123 Mon Sep 17 00:00:00 2001 From: hunt Date: Fri, 1 Feb 2008 19:06:02 +0000 Subject: 2008-02-01 Martin Hunt PR4736 * systemtap.printf/stap_merge.tcl: Copied here so it will always be available. --- testsuite/systemtap.printf/mixed_outb.exp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'testsuite/systemtap.printf/mixed_outb.exp') 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 -- cgit