diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | testsuite/lib/systemtap.exp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 58fa46bd..e374565d 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2009-01-30 Dave Brolley <brolley@redhat.com> + + * lib/systemtap.exp (setup_systemtap_environment): Make sure that + the build directory is on the path if using a server for 'make check'. + Use a string to check $server_pid. + 2009-01-23 Will Cohen <wcohen@redhat.com> * systemtap.samples/scf.stp: diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index f399073e..5bf125b9 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -62,17 +62,17 @@ proc setup_systemtap_environment {} { # Server management scripts and data are installed if this is an # install test, otherwise there is some setup to do. if {! [installtest_p]} then { - # Make sure the server management scripts are on the $PATH. - set env(PATH) "$srcdir/..:$env(PATH)" + # Make sure the server management scripts and tools are on the $PATH. + set env(PATH) "$srcdir/..:[exec pwd]/..:$env(PATH)" } # Try to find or start the server. set server_pid [exec stap-find-or-start-server] - if { $server_pid == -1 } then { + if { "$server_pid" == "-1" } then { print "Cannot find or start a systemtap server" set server_pid 0 # TODO: How do we abort here? - } elseif { $server_pid == 0 } then { + } elseif { "$server_pid" == "0" } then { print "A compatible systemtap server is already available" } else { print "Started a systemtap server as PID==$server_pid" |