diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-10-26 17:10:33 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-10-26 17:10:33 +0000 |
| commit | 5be277dece8cd97896c9f00779d0006513c10d3e (patch) | |
| tree | e2cf6636b1e0978d0ee2cc659f8a05a3671404cc /src | |
| parent | 1eb4cefb9f7770646c4b57ad16a7ac516da360c1 (diff) | |
| download | krb5-5be277dece8cd97896c9f00779d0006513c10d3e.tar.gz krb5-5be277dece8cd97896c9f00779d0006513c10d3e.tar.xz krb5-5be277dece8cd97896c9f00779d0006513c10d3e.zip | |
* rcp.exp, rsh_exp (stop_rsh_daemon): Do not close a process and
then look for eof. Some versions of expect go through a full
timeout in this scenario and others return immediately. New order:
kill process, expect eof, close, and then wait.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13866 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/ChangeLog | 7 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/rcp.exp | 2 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/rsh.exp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog index 815bc10835..c8d17c77a1 100644 --- a/src/tests/dejagnu/krb-standalone/ChangeLog +++ b/src/tests/dejagnu/krb-standalone/ChangeLog @@ -1,3 +1,10 @@ +2001-10-26 Ezra Peisach <epeisach@mit.edu> + + * rcp.exp, rsh_exp (stop_rsh_daemon): Do not close a process and + then look for eof. Some versions of expect go through a full + timeout in this scenario and others return immediately. New order: + kill process, expect eof, close, and then wait. + 2001-10-25 Ezra Peisach <epeisach@mit.edu> * rsh.exp (rsh_test): Add stop_rsh_daemon before invoking diff --git a/src/tests/dejagnu/krb-standalone/rcp.exp b/src/tests/dejagnu/krb-standalone/rcp.exp index 0c6d4df893..3367b3a291 100644 --- a/src/tests/dejagnu/krb-standalone/rcp.exp +++ b/src/tests/dejagnu/krb-standalone/rcp.exp @@ -72,9 +72,9 @@ proc stop_rsh_daemon { } { global krshd_pid if [info exists krshd_pid] { - catch "close -i $krshd_spawn_id" catch "exec kill $krshd_pid" catch "expect -i $krshd_spawn_id 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 f847f60714..802f5852c7 100644 --- a/src/tests/dejagnu/krb-standalone/rsh.exp +++ b/src/tests/dejagnu/krb-standalone/rsh.exp @@ -57,9 +57,9 @@ proc stop_rsh_daemon { } { global krshd_pid if [info exists krshd_pid] { - catch "close -i $krshd_spawn_id" catch "exec kill $krshd_pid" catch "expect -i $krshd_spawn_id eof" + catch "close -i $krshd_spawn_id" catch "wait -i $krshd_spawn_id" unset krshd_pid } |