* default.exp (stop_kerberos_daemons): Kill, expect eof, wait, in

	that order.  Avoids delivery of multiple signals (HUP+TERM) to KDC
	daemons when shutting down.

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

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index ba62754033375b695a41267815a731f14f985ff0..0ae598d654719aaa0129e3a1ab8b9247ea7835e2 100644 (file)
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-07  Tom Yu  <tlyu@mit.edu>
+
+       * default.exp (stop_kerberos_daemons): Kill, expect eof, wait, in
+       that order.  Avoids delivery of multiple signals (HUP+TERM) to KDC
+       daemons when shutting down.
+
 2002-09-29  Tom Yu  <tlyu@mit.edu>
 
        * default.exp (start_kerberos_daemons): Fix to use "tail -f" to

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 6c8dc9e0260734c42305ab6814e088d385b5b169..843c8909c03f4f3247861c2b38546c4b37ee0319 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -1501,8 +1501,8 @@ proc stop_kerberos_daemons { } {
     verbose "entered stop_kerberos_daemons"
 
     if [info exists kdc_pid] {
-       catch "close -i $kdc_spawn_id"
        catch "exec kill $kdc_pid"
+       catch "expect eof"
        set kdc_list [wait -i $kdc_spawn_id]
        verbose "wait -i $kdc_spawn_id returned $kdc_list (kdc)"
        unset kdc_pid
@@ -1510,8 +1510,8 @@ proc stop_kerberos_daemons { } {
     }
 
     if [info exists kadmind_pid] {
-       catch "close -i $kadmind_spawn_id"
        catch "exec kill $kadmind_pid"
+       catch "expect eof"
        set kadmind_list [wait -i $kadmind_spawn_id]
        verbose "wait -i $kadmind_spawn_id returned $kadmind_list (kadmind5)"
        unset kadmind_pid