From: Ken Raeburn <raeburn@mit.edu>
Date: Thu, 26 Feb 2004 04:35:09 +0000 (+0000)
Subject: * rcp.exp (stop_rsh_daemon): Check for any output before eof, causing any such
X-Git-Tag: krb5-1.4-beta1~581
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef3c278b41c74bf91432bb4b48aa5780ea6f583f;p=krb5.git

* rcp.exp (stop_rsh_daemon): Check for any output before eof, causing any such
info to be dumped into the debug log.
* rsh.exp (stop_rsh_daemon): Likewise.

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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 76bcf0aba..c178b4a50 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-25  Ken Raeburn  <raeburn@mit.edu>
 
+	* rcp.exp (stop_rsh_daemon): Check for any output before eof,
+	causing any such info to be dumped into the debug log.
+	* rsh.exp (stop_rsh_daemon): Likewise.
+
 	* gssapi.exp (doit): Fix typo in log message.
 
 2004-02-09  Ken Raeburn  <raeburn@mit.edu>
diff --git a/src/tests/dejagnu/krb-standalone/rcp.exp b/src/tests/dejagnu/krb-standalone/rcp.exp
index 3367b3a29..280ad8f08 100644
--- a/src/tests/dejagnu/krb-standalone/rcp.exp
+++ b/src/tests/dejagnu/krb-standalone/rcp.exp
@@ -73,7 +73,13 @@ proc stop_rsh_daemon { } {
 
     if [info exists krshd_pid] {
 	catch "exec kill $krshd_pid"
-	catch "expect -i $krshd_spawn_id eof"
+	catch {
+	    expect {
+		-i $krshd_spawn_id
+		-re ..*	{ exp_continue }
+		eof	{}
+	    }
+	}
 	catch "close -i $krshd_spawn_id"
 	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 2cd680201..12c7d38e5 100644
--- a/src/tests/dejagnu/krb-standalone/rsh.exp
+++ b/src/tests/dejagnu/krb-standalone/rsh.exp
@@ -58,7 +58,13 @@ proc stop_rsh_daemon { } {
 
     if [info exists krshd_pid] {
 	catch "exec kill $krshd_pid"
-	catch "expect -i $krshd_spawn_id eof"
+	catch {
+	    expect {
+		-i $krshd_spawn_id
+		-re ..*	{ exp_continue }
+		eof	{}
+	    }
+	}
 	catch "close -i $krshd_spawn_id"
 	catch "wait -i $krshd_spawn_id"
 	unset krshd_pid