diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
| commit | 02615365a92ca2570c1f96abc8a97674aa2ccae1 (patch) | |
| tree | ebedfd91a0f6d299b39e84295e091e12c0767dc8 /testsuite/lib | |
| parent | c3bad3042df505a3470f1e20b09822a9df1d4761 (diff) | |
| parent | adc67597f327cd43d58b1d0cb740dab14a75a058 (diff) | |
| download | systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.gz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.xz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.zip | |
Merge branch 'master' into pr6866
Conflicts:
ChangeLog: Removed
runtime/ChangeLog: Removed
runtime/sym.c: Merged
runtime/task_finder.c: Merged
tapset/ChangeLog: Removed
testsuite/ChangeLog: Removed
Diffstat (limited to 'testsuite/lib')
| -rw-r--r-- | testsuite/lib/systemtap.exp | 8 |
1 files changed, 4 insertions, 4 deletions
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" |