stap-client will now always choose a compatible server even for phases 1-3.

Always start a local server needed by the test suite (make {install}check).

diff --git a/stap-client b/stap-client
index c3afab891cb79a6c484ddbd56fb2d23248d08130..449d4a3daca5b7bf17734125497cd8eb57dc9b66 100755 (executable)
--- a/stap-client
+++ b/stap-client
@@ -251,10 +251,11 @@ function parse_options {
     test "X$local_ssl_dbs" != "X " -o "X$public_ssl_dbs" != "X" || \
        fatal "No usable certificate databases found"
 
-    # We can use any server if the phase is less than 5
-    if test $p_phase -lt 5; then
-       find_all="--all"
-    fi
+    # We can use any server if the phase is less than 4
+    # But don't for now....
+    #if test $p_phase -lt 4; then
+    #  find_all="--all"
+    #fi
 }
 
 # function: get_arg FIRSTWORD SECONDWORD

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 82afb6b7b450c5dde179fea2c991fa245ffb5ab4..1a73f7cf8ba259a2aca4544c7dd26ef38dcbda80 100644 (file)
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -144,13 +144,11 @@ proc setup_server {} {
     }
 
     # 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 [exec stap-start-server]
+    if { "$server_pid" == "" } then {
+       print "Cannot start a systemtap server"
        set server_pid 0
        return 0
-    } elseif { "$server_pid" == "0" } then {
-       print "A compatible systemtap server is already available"
     } else {
        print "Started a systemtap server as PID==$server_pid"
     }