diff options
Diffstat (limited to 'testsuite/systemtap.syscall')
| -rw-r--r-- | testsuite/systemtap.syscall/ChangeLog | 4 | ||||
| -rwxr-xr-x | testsuite/systemtap.syscall/test.tcl | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/testsuite/systemtap.syscall/ChangeLog b/testsuite/systemtap.syscall/ChangeLog index 9f0bf54e..0879cc52 100644 --- a/testsuite/systemtap.syscall/ChangeLog +++ b/testsuite/systemtap.syscall/ChangeLog @@ -1,3 +1,7 @@ +2006-09-26 David Smith <dsmith@redhat.com> + + * test.tcl: Looks for 'staprun' instead of 'stpd'. + 2006-07-21 Martin Hunt <hunt@redhat.com> * signal.c: Fix expected pattern. diff --git a/testsuite/systemtap.syscall/test.tcl b/testsuite/systemtap.syscall/test.tcl index a73e22c9..ee797565 100755 --- a/testsuite/systemtap.syscall/test.tcl +++ b/testsuite/systemtap.syscall/test.tcl @@ -34,20 +34,17 @@ set filename "${testname}.c" if {$modname == ""} { set cmd "stap -c ../${testname} ../sys.stp" } else { - set stpd "" - set stpd_list "/usr/local/libexec/systemtap/stpd /usr/libexec/systemtap/stpd" - foreach path $stpd_list { - if {[file exists $path]} { - set stpd $path - break - } - } - if {$stpd == ""} { - puts "stpd not found!" + set ccmd "which staprun" + catch {eval exec $ccmd} output + if {[file exists $output]} { + set staprun $output + } else { + puts "staprun not found!" exit } + set user $::tcl_platform(user) - set cmd "sudo $stpd -rmq -u $user -c ../${testname} ${modname}" + set cmd "sudo $staprun -rmq -u $user -c ../${testname} ${modname}" } # Extract the expected results |