From 3656df71d36ed682dea2108272de17209ea7f54b Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Fri, 28 Aug 2009 16:47:20 -0400
Subject: 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).

---
 stap-client                 | 9 +++++----
 testsuite/lib/systemtap.exp | 8 +++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/stap-client b/stap-client
index c3afab89..449d4a3d 100755
--- 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 82afb6b7..1a73f7cf 100644
--- 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"
     }
-- 
cgit