From: Tom Yu <tlyu@mit.edu>
Date: Wed, 24 Oct 2001 04:12:52 +0000 (+0000)
Subject: 	* rcp.exp (stop_rsh_daemon): Call "expect eof" to drain pty buffer
X-Git-Tag: krb5-1.3-alpha1~1016
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9737eee586b3bb57f417a235fecd98ba34bdf0e0;p=krb5.git

	* rcp.exp (stop_rsh_daemon): Call "expect eof" to drain pty buffer
	and avoid deadlock.

	* rsh.exp (stop_rsh_daemon, rsh_test): Call "expect eof" to drain
	pty buffer and avoid deadlock.

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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index e34d13e61..7eb71b303 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-24  Tom Yu  <tlyu@mit.edu>
+
+	* rcp.exp (stop_rsh_daemon): Call "expect eof" to drain pty buffer
+	and avoid deadlock.
+
+	* rsh.exp (stop_rsh_daemon, rsh_test): Call "expect eof" to drain
+	pty buffer and avoid deadlock.
+
 2001-07-04  Ezra Peisach  <epeisach@mit.edu>
 
 	* v4gssftp.exp, gssftp.exp: Test transfering a file > 1MB to
diff --git a/src/tests/dejagnu/krb-standalone/rcp.exp b/src/tests/dejagnu/krb-standalone/rcp.exp
index 59125b78f..0c6d4df89 100644
--- a/src/tests/dejagnu/krb-standalone/rcp.exp
+++ b/src/tests/dejagnu/krb-standalone/rcp.exp
@@ -74,6 +74,7 @@ proc stop_rsh_daemon { } {
     if [info exists krshd_pid] {
 	catch "close -i $krshd_spawn_id"
 	catch "exec kill $krshd_pid"
+	catch "expect -i $krshd_spawn_id eof"
 	catch "wait -i $krshd_spawn_id"
 	unset krshd_pid
     }
diff --git a/src/tests/dejagnu/krb-standalone/rsh.exp b/src/tests/dejagnu/krb-standalone/rsh.exp
index 0cb8304b4..82f0ad3e4 100644
--- a/src/tests/dejagnu/krb-standalone/rsh.exp
+++ b/src/tests/dejagnu/krb-standalone/rsh.exp
@@ -59,6 +59,7 @@ proc stop_rsh_daemon { } {
     if [info exists krshd_pid] {
 	catch "close -i $krshd_spawn_id"
 	catch "exec kill $krshd_pid"
+	catch "expect -i $krshd_spawn_id eof"
 	catch "wait -i $krshd_spawn_id"
 	unset krshd_pid
     }
@@ -140,6 +141,7 @@ proc rsh_test { } {
 	}
     }
 
+    catch "expect eof"
     if { $failed == "no" } {
 	if ![check_exit_status $testname] {
 	    return