From 961588fd58020a7c21e4a9c0c50bc5a5f26e4790 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Fri, 18 Dec 2009 16:22:01 -0500 Subject: PR 10247 10276 10905: Infrastructure for moving underlying client/server tools to libexec. --- testsuite/lib/systemtap.exp | 1 - 1 file changed, 1 deletion(-) (limited to 'testsuite/lib/systemtap.exp') diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index 13e6d1a2..2c46e30f 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -155,7 +155,6 @@ proc setup_server {} { # The server does not call this instance of 'stap' if {[installtest_p]} then { exec /bin/cp -p [exec which stap-client] $net_path/stap - exec /bin/cp -p [exec which stap-env] $net_path/stap-env } else { exec /bin/cp -p $srcdir/../stap-client $net_path/stap exec /bin/cp -p $srcdir/../stap-env $net_path/stap-env -- cgit From edecda6cff1304fca4c47034b7064dcd51bcc33d Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Mon, 21 Dec 2009 11:26:05 -0500 Subject: PR 10247, 10276, 10905: Move remaining client/server tools to libexec. --- testsuite/lib/systemtap.exp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'testsuite/lib/systemtap.exp') diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index 2c46e30f..34ac3b04 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -134,10 +134,13 @@ proc setup_server {} { # Server management scripts and data are installed if this is an # install test, otherwise there is some setup to do. + # Make sure the server management scripts and tools are on the $PATH. if {! [installtest_p]} then { - # Make sure the server management scripts and tools are on the $PATH. set env(PATH) "$srcdir/..:[exec pwd]/..:$env(PATH)" set env(SYSTEMTAP_SERVER_SCRIPTS) "$srcdir/.." + } else { + set env(PATH) "$env(PKGLIBDIR):$env(PATH)" + set env(SYSTEMTAP_SERVER_SCRIPTS) env(PKGLIBDIR) } # Try to find or start the server. -- cgit From 2bdb71392526de784316f39c20a905425cba0607 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Mon, 21 Dec 2009 13:46:10 -0500 Subject: Get PATH correct for fidning libexec tools for installcheck. --- testsuite/lib/systemtap.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'testsuite/lib/systemtap.exp') 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 -- cgit From d12a5be645d7036e7834308e714496f57adda852 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Mon, 21 Dec 2009 15:40:55 -0500 Subject: Make sure we log server activity when testing using a server. --- testsuite/lib/systemtap.exp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'testsuite/lib/systemtap.exp') diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index 6ea345c7..e0e01bcc 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -143,8 +143,17 @@ proc setup_server {} { set env(SYSTEMTAP_SERVER_SCRIPTS) $env(PKGLIBDIR) } + # Erase the old server log file. + set logfile "[exec pwd]/server.log" + if {[file exists $logfile]} then { + exec rm -f $logfile; + } + # Create a new one and make sure it's world writable. + exec touch $logfile + exec chmod 666 $logfile + # Try to find or start the server. - set server_pid [exec stap-start-server --log=[exec pwd]/server.log] + set server_pid [exec stap-start-server --log=$logfile] if { "$server_pid" == "" } then { print "Cannot start a systemtap server" set server_pid 0 -- cgit