* default.exp: Log krb5kdc to stderr so that test can detect

		properly when server has started. Change
		start_kerberos_daemons to take advantage of this.

Before, every time the server was started, the test would have to wait
for the standard timeout (100 sec) before continuing with the test.
The standalone tests used to take 15.5 min and now take 4.

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

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index 7dc7c38fb8de71d5e6b50918e7e7aefd1bd77ca4..a6a23ddce4a5964c3a3c20ec5452210d0c7923e7 100644 (file)
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar  4 20:45:30 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * default.exp: Log krb5kdc to stderr so that test can detect
+               properly when server has started. Change
+               start_kerberos_daemons to take advantage of this.
+
 Sat Oct  7 08:03:43 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * default.exp: Change kdc.conf ports definitions to current

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index cb7f7d2cac52661aaa190b51c8707d986a129c05..343c90e4cb08531bc6f364ab9be97095db4da0b8 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -269,6 +269,7 @@ proc setup_kerberos_files { } {
     puts $conffile "   admin_server = STDERR"
     puts $conffile "   admin_server = FILE:$tmppwd/kadmind5.log"
     puts $conffile "   kdc = FILE:$tmppwd/kdc.log"
+    puts $conffile "   kdc = STDERR"
     puts $conffile "   default = FILE:$tmppwd/others.log"
     close $conffile
     }
@@ -692,8 +693,20 @@ proc start_kerberos_daemons { standalone } {
     spawn $KRB5KDC -r KRBTEST.COM -n
     set kdc_pid [exp_pid]
     set kdc_spawn_id $spawn_id
+
     expect {
-       -re ".+" {
+       "while.*\r" {
+           fail "krb5kdc"
+           stop_kerberos_daemons
+           return 0
+       }
+       "commencing operation\r" { }
+       timeout {
+           fail "krb5kdc"
+           stop_kerberos_daemons
+           return 0
+       }
+       eof {
            fail "krb5kdc"
            stop_kerberos_daemons
            return 0