svn rev #23934: trunk/src/ appl/gss-sample/ tests/dejagnu/krb-standalone/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23934
Commit By: ghudson
Log Message:
Add a sentinel to the sample gss-server after the socket is ready, and
use it in gssapi.exp in the dejagnu test suite instead of sleeping.



Changed Files:
U   trunk/src/appl/gss-sample/gss-server.c
U   trunk/src/tests/dejagnu/krb-standalone/gssapi.exp
Modified: trunk/src/appl/gss-sample/gss-server.c
===================================================================
--- trunk/src/appl/gss-sample/gss-server.c	2010-04-24 18:53:25 UTC (rev 23933)
+++ trunk/src/appl/gss-sample/gss-server.c	2010-04-24 19:12:34 UTC (rev 23934)
@@ -731,6 +731,7 @@
         if ((stmp = create_socket(port)) >= 0) {
             if (listen(stmp, max_threads == 1 ? 0 : max_threads) < 0)
                 perror("listening on socket");
+            fprintf(stderr, "starting...\n");
 
             do {
                 struct _work_plan *work = malloc(sizeof(struct _work_plan));

Modified: trunk/src/tests/dejagnu/krb-standalone/gssapi.exp
===================================================================
--- trunk/src/tests/dejagnu/krb-standalone/gssapi.exp	2010-04-24 18:53:25 UTC (rev 23933)
+++ trunk/src/tests/dejagnu/krb-standalone/gssapi.exp	2010-04-24 19:12:34 UTC (rev 23934)
@@ -285,8 +285,12 @@
     spawn $GSSSERVER -export -logfile $tmppwd/gss-server.log -verbose -port [expr 8 + $portbase] gssservice@$hostname
     set gss_server_pid [exp_pid]
     set gss_server_spawn_id $spawn_id
-    sleep 2
 
+    expect {
+	"starting" { }
+	eof        { perror "gss-server failed to start" }
+    }
+
     run_client gssclient0 $tmppwd/gss_tk_0 gssclient0
     run_client gssclient1 $tmppwd/gss_tk_1 gssclient1
     run_client gssclient2 $tmppwd/gss_tk_2 gssclient2