diff options
| author | hunt <hunt> | 2007-06-20 21:37:26 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2007-06-20 21:37:26 +0000 |
| commit | c65179207e8f5a06271dfe5519366c42f5b6b152 (patch) | |
| tree | 452d3d2f211439c63421f9a01fc5a713b5134113 /testsuite/systemtap.printf/out2b.exp | |
| parent | 0bcb278dec439c699485c7fab8bd1174550788d9 (diff) | |
| download | systemtap-steved-c65179207e8f5a06271dfe5519366c42f5b6b152.tar.gz systemtap-steved-c65179207e8f5a06271dfe5519366c42f5b6b152.tar.xz systemtap-steved-c65179207e8f5a06271dfe5519366c42f5b6b152.zip | |
2007-06-20 Martin Hunt <hunt@redhat.com>
* systemtap.printf/*b.exp: Add code to look in the
toplevel directory for stap_merge.
Diffstat (limited to 'testsuite/systemtap.printf/out2b.exp')
| -rw-r--r-- | testsuite/systemtap.printf/out2b.exp | 11 |
1 files changed, 9 insertions, 2 deletions
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 } |