From c65179207e8f5a06271dfe5519366c42f5b6b152 Mon Sep 17 00:00:00 2001 From: hunt Date: Wed, 20 Jun 2007 21:37:26 +0000 Subject: 2007-06-20 Martin Hunt * systemtap.printf/*b.exp: Add code to look in the toplevel directory for stap_merge. --- testsuite/systemtap.printf/out2b.exp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'testsuite/systemtap.printf/out2b.exp') 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 } -- cgit