Merge commit 'origin/master' into pr4225

* commit 'origin/master': (34 commits)
  PR5049: fix overbroad effects of naive "*" prefixing; instead use optional "*/" only.
  stap-serverd was incorectly determining that the server could
  stapprobes man page: clarify statement(NUM).absolute and process("path") searching
  PR5049: prefix with "*" any filenames given in "fn@filename:line" probes
  Indentation fix.
  Redirect stderr gets redircted so warnings don't let example script run fail.
  PR6835. io/io_submit.stp: Fix #! start. Convert to normal line-ending.
  PR2895. Add proper #! /usr/bin/env stap line. Make example scripts executable.
  Use INSTALL_PROGRAM, not INSTALL_DATA for executable .stp scripts.
  example index: only warn if old, do not regenerate
  Start/stop the systemtap server from systemtap.exp and not in the top level Makefile.
  Lower statement wildcard test matching threshold.
  Moved details of utrace detach to stap_utrace_detach().
  Saves thread vma information.
  Always generate examples indexes and install examples from srcdir.
  Refer to srcdir spec file Makefile so make rpm works when builddir != srcdir.
  Add index of subsystem and keywords at top of HTML indexes.
  Don't output output, exits, status line in indexes (mentioned in descriptions).
  Disable chmodding of samples/kmalloc-top in spec file since it isn't installed.
  Make sure examples indexes are always generated in builddir.
  ...

1 files changed, 48 insertions, 2 deletions

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index db5c1587..8b533303 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -37,7 +37,7 @@ proc print_systemtap_version {} {
 
 
 proc setup_systemtap_environment {} {
-    global srcdir prefix env
+    global srcdir prefix env server_pid
 
     # need an absolute SRCDIR for the top-level src/ tree
     # XXX: or, we could change nearby uses of ${SRCDIR}/testsuite to ${SRCDIR}
@@ -51,6 +51,41 @@ proc setup_systemtap_environment {} {
     # make check and sudo make check don't clobber each other.
     set env(SYSTEMTAP_DIR) [exec pwd]/.systemtap-[exec whoami]
 
+    # Find or start a systemtap server, if requested.
+    if {[use_server_p]} then {
+	print "Testing using a systemtap server"
+
+	# Server management scripts are installed if this is an install test, otherwise
+	# in the source directory. Make sure they are on the $PATH.
+	if {! [installtest_p]} then {
+	    set env(PATH) "$srcdir/..:$env(PATH)"
+	}
+
+	# Try to find or start the server.
+	set server_pid [exec stap-find-or-start-server]
+	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 {
+	    print "A compatible systemtap server is already available"
+	} else {
+	    print "Started a systemtap server as PID==$server_pid"
+	}
+
+	# Make a copy of 'stap-client' as 'stap' and make sure it's at the
+	# beginning of the $PATH. Do this after starting the server so that
+	# The server does not call this instance of 'stap'
+	set client_path [exec pwd]/net
+	exec /bin/mkdir -p $client_path
+	if {[installtest_p]} then {
+	    exec /bin/cp -p [exec which stap-client] $client_path/stap
+	} else {
+	    exec /bin/cp -p $srcdir/../stap-client $client_path/stap
+	}
+	set env(PATH) "$client_path:$env(PATH)"
+    }
+
     # PATH, SYSTEMTAP_TAPSET, SYSTEMTAP_RUNTIME, LD_LIBRARY_PATH are already set.
     foreach var {PATH STAP SRCDIR SYSTEMTAP_TAPSET SYSTEMTAP_RUNTIME SYSTEMTAP_DIR LD_LIBRARY_PATH} {
         if [info exists env($var)] {
@@ -84,7 +119,18 @@ get_system_info
 
 proc systemtap_init {args} {}
 proc systemtap_version {} {}
-proc systemtap_exit {} {}
+
+proc systemtap_exit {} {
+    global server_pid
+
+    # Stop the stap server, if we started it.
+    if {[use_server_p]} then {
+	if { $server_pid != 0 } then {
+	    print "Stopping the systemtap server with PID==$server_pid"
+	    exec stap-stop-server $server_pid
+	}
+    }
+}
 
 
 proc stap_run_batch {args} {