From: Ezra Peisach <epeisach@mit.edu>
Date: Tue, 5 Mar 1996 01:51:23 +0000 (+0000)
Subject: 	* default.exp: Log krb5kdc to stderr so that test can detect
X-Git-Tag: krb5-1.0-beta6~409
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a6cf4818457ebde70ced9f07024474ea7509d2d;p=krb5.git

	* 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 7dc7c38fb..a6a23ddce 100644
--- 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 cb7f7d2ca..343c90e4c 100644
--- 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