1 files changed, 19 insertions, 1 deletions
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 0f6a69dd..e74bd13c 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -2,11 +2,29 @@ load_lib site.exp
 
 proc installtest_p {} {
     global TOOL_OPTIONS
-    if {[info exists TOOL_OPTIONS] && ($TOOL_OPTIONS == "install")} {
+    if {[info exists TOOL_OPTIONS] && [string match "*install*" $TOOL_OPTIONS]} {
         return 1
     } else { return 0 }
 }
 
+
+proc use_server_p {} {
+    global TOOL_OPTIONS
+    if {[info exists TOOL_OPTIONS] && [string match "*server*" $TOOL_OPTIONS]} {
+        return 1
+    } else { return 0 }
+}
+
+
+proc stap_exec {} {
+    if {[info procs use_server_p] != "" && [use_server_p]} then {
+	return "stap-client"
+    } else {
+	return "stap"
+    }
+}
+
+
 proc print_systemtap_version {} {
     set version [exec /bin/uname -r]
     set location "/boot/vmlinux-$version"