* default.exp: Default RLOGIN_FLAGS to "-x".

(start_kerberos_daemons): Watch for "Cannot bind server socket" and log it.
Watch for "no sockets set up" and report an error.
(setup_root_shell): Watch for "Cannot assign requested address", log it and
give up.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15541 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index f97939601a0ec24aadd61f59d2285a9ec8effc95..06881a7196713de3608e8ea872a443f6abca78c3 100644 (file)
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-01  Ken Raeburn  <raeburn@mit.edu>
+
+       * default.exp: Default RLOGIN_FLAGS to "-x".
+       (start_kerberos_daemons): Watch for "Cannot bind server socket"
+       and log it.  Watch for "no sockets set up" and report an error.
+       (setup_root_shell): Watch for "Cannot assign requested address",
+       log it and give up.
+
 2003-05-21  Tom Yu  <tlyu@mit.edu>
 
        * default.exp: Be slightly more lenient about matching password

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index d72cc5dbef8437eb9fdc9a39406979f31111eef7..3e6b27f2874d7e136082158cb879a944d58b770a 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -378,7 +378,7 @@ if ![info exists RLOGIN] {
 }
 
 if ![info exists RLOGIN_FLAGS] {
-    set RLOGIN_FLAGS ""
+    set RLOGIN_FLAGS "-x"
 }
 
 # We use a couple of variables to hold shell prompts which may be
@@ -1321,6 +1321,23 @@ proc start_kerberos_daemons { standalone } {
     expect {
        -i $tailf_spawn_id
        -re "commencing operation\r\n" { }
+       -re "krb5kdc: \[a-zA-Z\]* - Cannot bind server socket to \[ 0-9a-fA-F:.\]*\r\n" {
+           verbose -log "warning: $expect_out(0,string)"
+           exp_continue
+       }
+       "no sockets set up?" {
+           if {$standalone} {
+               verbose -log "krb5kdc startup failed to bind listening sockets"
+               fail "krb5kdc"
+           } else {
+               perror "krb5kdc startup failed to bind listening sockets"
+           }
+           stop_kerberos_daemons
+           exec kill $tailf_pid
+           expect -i $tailf_spawn_id eof
+           wait -i $tailf_spawn_id
+           return 0
+       }
        timeout {
            if {$standalone} {
                verbose -log "krb5kdc startup timed out"
@@ -2213,6 +2230,13 @@ proc setup_root_shell { testname } {
            stop_root_shell
            return 0
        }
+       "Cannot assign requested address" {
+           note "$testname: rlogin as root 'cannot assign requested address'"
+           unsupported "$testname"
+           set timeout $old_timeout
+           stop_root_shell
+           return 0
+       }
        -re "$ROOT_PROMPT" { }
        timeout {
            perror "timeout from rlogin $hostname -l root"