diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-02-26 04:35:09 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-02-26 04:35:09 +0000 |
| commit | ef3c278b41c74bf91432bb4b48aa5780ea6f583f (patch) | |
| tree | f03214f1d01929516b9e2f83e629e06eda731e6c | |
| parent | 8e1654f535a75d723a8928a50ac03b95cda2ed74 (diff) | |
| download | krb5-ef3c278b41c74bf91432bb4b48aa5780ea6f583f.zip krb5-ef3c278b41c74bf91432bb4b48aa5780ea6f583f.tar.gz krb5-ef3c278b41c74bf91432bb4b48aa5780ea6f583f.tar.bz2 | |
* 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
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/ChangeLog | 4 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/rcp.exp | 8 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/rsh.exp | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog index 76bcf0a..c178b4a 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 3367b3a..280ad8f 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 2cd6802..12c7d38 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 |