summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-12-21 13:46:10 -0500
committerDave Brolley <brolley@redhat.com>2009-12-21 13:46:10 -0500
commit2bdb71392526de784316f39c20a905425cba0607 (patch)
tree8dc3640dd1aee4ba173ce139c7eee69963f6548f
parent25a0404570724499bcdf1ebfd9f03084c2e00137 (diff)
downloadsystemtap-steved-2bdb71392526de784316f39c20a905425cba0607.tar.gz
systemtap-steved-2bdb71392526de784316f39c20a905425cba0607.tar.xz
systemtap-steved-2bdb71392526de784316f39c20a905425cba0607.zip
Get PATH correct for fidning libexec tools for installcheck.
-rw-r--r--testsuite/lib/systemtap.exp8
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 34ac3b04..6ea345c7 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -113,8 +113,8 @@ proc setup_server {} {
# Make sure that the necessary resources are available to run the client/server.
if {[installtest_p]} then {
- if {[catch {exec /usr/bin/which stap-client-connect} dummy]} then {
- print "Unable to start a server: stap-client-connect is not found in PATH"
+ if {! [file exists $env(PKGLIBDIR)/stap-client-connect]} then {
+ print "Unable to start a server: stap-client-connect is not installed"
return 0
}
} elseif {! [file exists [exec pwd]/../stap-client-connect]} then {
@@ -140,11 +140,11 @@ proc setup_server {} {
set env(SYSTEMTAP_SERVER_SCRIPTS) "$srcdir/.."
} else {
set env(PATH) "$env(PKGLIBDIR):$env(PATH)"
- set env(SYSTEMTAP_SERVER_SCRIPTS) env(PKGLIBDIR)
+ set env(SYSTEMTAP_SERVER_SCRIPTS) $env(PKGLIBDIR)
}
# Try to find or start the server.
- set server_pid [exec stap-start-server]
+ set server_pid [exec stap-start-server --log=[exec pwd]/server.log]
if { "$server_pid" == "" } then {
print "Cannot start a systemtap server"
set server_pid 0