diff options
| author | Mark Wielaard <mjw@redhat.com> | 2008-11-13 16:24:30 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2008-11-13 16:24:30 +0100 |
| commit | ebcb173dc614db9a143febec19c8fc6a7b17cf2a (patch) | |
| tree | 2761366ecee3c459000d79d60fff0bf8741de37c /testsuite | |
| parent | 588b83de0b2c3afdc06e9f84254f0b233c853736 (diff) | |
| download | systemtap-steved-ebcb173dc614db9a143febec19c8fc6a7b17cf2a.tar.gz systemtap-steved-ebcb173dc614db9a143febec19c8fc6a7b17cf2a.tar.xz systemtap-steved-ebcb173dc614db9a143febec19c8fc6a7b17cf2a.zip | |
Testsuite, pick up the correct stap being tested when executing under sudo.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | testsuite/systemtap.base/bz6850.exp | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.base/uprobes.exp | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index a59d3a05..8a9c14c4 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-11-13 Mark Wielaard <mjw@redhat.com> + + * systemtap.base/bz6850.exp: Pick up the stap being tested when + executing under sudo. + * systemtap.base/uprobes.exp: Likewise. + 2008-11-12 Frank Ch. Eigler <fche@elastic.org> PR6964. 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 } |