svn rev #23936: trunk/src/ appl/simple/server/ tests/dejagnu/krb-standalone/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23936
Commit By: ghudson
Log Message:
Add a sentinel line to sim_server after the socket is ready, and use
it in simple.exp in the dejagnu test suite instead of sleeping.



Changed Files:
U   trunk/src/appl/simple/server/sim_server.c
U   trunk/src/tests/dejagnu/krb-standalone/simple.exp
Modified: trunk/src/appl/simple/server/sim_server.c
===================================================================
--- trunk/src/appl/simple/server/sim_server.c	2010-04-24 19:20:11 UTC (rev 23935)
+++ trunk/src/appl/simple/server/sim_server.c	2010-04-24 19:24:36 UTC (rev 23936)
@@ -172,6 +172,8 @@
         exit(1);
     }
 
+    printf("starting...\n");
+
 #ifdef DEBUG
     printf("socket has port # %d\n", ntohs(s_sock.sin_port));
 #endif

Modified: trunk/src/tests/dejagnu/krb-standalone/simple.exp
===================================================================
--- trunk/src/tests/dejagnu/krb-standalone/simple.exp	2010-04-24 19:20:11 UTC (rev 23935)
+++ trunk/src/tests/dejagnu/krb-standalone/simple.exp	2010-04-24 19:24:36 UTC (rev 23936)
@@ -46,8 +46,10 @@
 
     verbose "sim_server_spawn is $sim_server_spawn_id" 1
 
-    # Give sim_server some time to start
-    sleep 2
+    expect {
+	"starting"	{ }
+	eof		{ perror "sim_server failed to start" }
+    }
 
     return 1
 }