Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  Mention distro specific elfutils development sub-packages needed when not found.
  Change system-wide probes from 'process("*").begin' to 'process.begin'.
  PR6836: tweak $$return formatting
  extend callgraph example to use $$parms / $$return
  PR6836: $$vars extensions, $$return
  small patch ...
  PR 6834
  PR6842: work around possibly null task->signal in utrace death callback
  Minor bugs in stap-client.
  build compatibility and speed hack for bundled-elfutils mode
  revise build instructions; clarifying elfutils bundling and its new hosting site
  kbuild compatibility hack for separate-objdir O= builds
  PR 6445 (partial).  Implemented system-wide utrace probes.
  Fixed compilation warning on gcc 3.x
  let $$vars work even with unsupported c types (e.g., funkytown floats)

1 files changed, 5 insertions, 2 deletions

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 8b533303..28129f0a 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 server_pid
+    global srcdir prefix env server_pid client_path
 
     # need an absolute SRCDIR for the top-level src/ tree
     # XXX: or, we could change nearby uses of ${SRCDIR}/testsuite to ${SRCDIR}
@@ -121,7 +121,7 @@ proc systemtap_init {args} {}
 proc systemtap_version {} {}
 
 proc systemtap_exit {} {
-    global server_pid
+    global server_pid client_path
 
     # Stop the stap server, if we started it.
     if {[use_server_p]} then {
@@ -129,6 +129,9 @@ proc systemtap_exit {} {
 	    print "Stopping the systemtap server with PID==$server_pid"
 	    exec stap-stop-server $server_pid
 	}
+
+	# Remove the temporary stap script
+	exec /bin/rm -fr $client_path
     }
 }