diff options
| author | Tom Yu <tlyu@mit.edu> | 2001-10-24 04:12:52 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2001-10-24 04:12:52 +0000 |
| commit | 9737eee586b3bb57f417a235fecd98ba34bdf0e0 (patch) | |
| tree | d249265b33b2a47b3068d7f7358fb2f3d5bed938 /src | |
| parent | 50c779b74da8adef4f3a811e5c3ff031d5680270 (diff) | |
| download | krb5-9737eee586b3bb57f417a235fecd98ba34bdf0e0.tar.gz krb5-9737eee586b3bb57f417a235fecd98ba34bdf0e0.tar.xz krb5-9737eee586b3bb57f417a235fecd98ba34bdf0e0.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/ChangeLog | 8 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/rcp.exp | 1 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/rsh.exp | 2 |
3 files changed, 11 insertions, 0 deletions
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 |