* 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 76bcf0aba1eb2af254099db26a0be60e604e8025..c178b4a501de1c28752014c8f049851dcaa283a2 100644 (file)
--- 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 3367b3a2911f0c576ba079bbb45db723256bcb2d..280ad8f08ee587bd50b81d5f760efa101e2cb06d 100644 (file)
--- 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 2cd680201f30eb5a8c1c9108bf94c574fe94d35b..12c7d38e515a02276f29e4650278a6900100075e 100644 (file)
--- 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