global server_started
global kill
+ if { [info exists server_started] && $server_started == 0 } {
+ return
+ }
+
if {[catch {
expect {
-i $server_id
verbose "% $SERVER" 1
set server_pid [spawn $SERVER $PROT]
set server_id $spawn_id
+ set server_started 1
unset env(KRB5_KTNAME)
expect {
"running" { }
+ "Cannot register service" {
+ send_error "Server cannot register with portmap/rpcbind!!\n"
+ note "+++"
+ note "+++ These tests require the ability to register with portmap/rpcbind"
+ note "+++ Either the server is not running or it does not"
+ note "+++ allow registration using a loopback connection"
+ note "+++"
+ verbose $expect_out(buffer) 1
+ set server_started 0
+ unsupported "Server registration"
+ return
+ }
eof {
send_error "server exited!"
verbose $expect_out(buffer) 1
load_lib "helpers.exp"
-global spawn_id
+global server_started
proc expired {} {
global spawn_id server_id
flush_server
}
-expired
+
+#if { [info exists server_pid] && ($server_pid >= 0) } { expired }
+if { $server_started } {expired }
proc overlap {} {
global spawn_id
flush_server
}
-overlap
+if { $server_started } {overlap}