summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.base
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/systemtap.base')
-rw-r--r--testsuite/systemtap.base/bz6850.exp4
-rw-r--r--testsuite/systemtap.base/uprobes.exp4
2 files changed, 6 insertions, 2 deletions
diff --git a/testsuite/systemtap.base/bz6850.exp b/testsuite/systemtap.base/bz6850.exp
index cd56ddce..b06b1696 100644
--- a/testsuite/systemtap.base/bz6850.exp
+++ b/testsuite/systemtap.base/bz6850.exp
@@ -8,7 +8,9 @@ if {$rc == 0} then { pass "$test -p4" } else { fail "$test -p4" }
if {! [installtest_p]} { untested "$test -p5"; return }
-spawn sudo stap $srcdir/$subdir/bz6850.stp -c ./bz6850
+# Pick up the stap being tested.
+set stapexe [exec /usr/bin/which stap]
+spawn sudo $stapexe $srcdir/$subdir/bz6850.stp -c ./bz6850
expect {
-timeout 60
-re {[^\r\n]*called\r\n} { exp_continue }
diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp
index 02a0fd33..c1b9968c 100644
--- a/testsuite/systemtap.base/uprobes.exp
+++ b/testsuite/systemtap.base/uprobes.exp
@@ -23,7 +23,9 @@ if {$rc == 0} then { pass "$test -p4" } else { fail "$test -p4" }
if {! [installtest_p]} { untested "$test -p5"; exec rm -f jennie.c jennie; return }
-spawn sudo stap -v $srcdir/$subdir/uprobes.stp -c "./jennie 1 2 3 4"
+# Pick up the stap being tested.
+set stapexe [exec /usr/bin/which stap]
+spawn sudo $stapexe -v $srcdir/$subdir/uprobes.stp -c "./jennie 1 2 3 4"
set ok 0
expect {
-re {^Pass[^\r\n]*\r\n} { exp_continue }