diff options
| author | hunt <hunt> | 2008-02-01 19:06:02 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2008-02-01 19:06:02 +0000 |
| commit | 2129d358c4aba84430a18f86309f2aa70a8fd123 (patch) | |
| tree | 92297211dbb994cda146dd3e249805fa6293bc55 /testsuite/systemtap.printf/mixed_outb.exp | |
| parent | 90a9d9a51bbed3b989f1c16384ae3bc271eb48ca (diff) | |
| download | systemtap-steved-2129d358c4aba84430a18f86309f2aa70a8fd123.tar.gz systemtap-steved-2129d358c4aba84430a18f86309f2aa70a8fd123.tar.xz systemtap-steved-2129d358c4aba84430a18f86309f2aa70a8fd123.zip | |
2008-02-01 Martin Hunt <hunt@redhat.com>
PR4736
* systemtap.printf/stap_merge.tcl: Copied here so
it will always be available.
Diffstat (limited to 'testsuite/systemtap.printf/mixed_outb.exp')
| -rw-r--r-- | testsuite/systemtap.printf/mixed_outb.exp | 8 |
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 |