* api.1/lock.exp (lock_test_continue): After exiting the loop, send the process

a signal before waiting for it to die.

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

diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 446c9af44b39c3b85f75e4b2d48c12a259c10d18..aa8e3c472a93a49a2ebcab1659c5ebe135a87b08 100644 (file)
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * api.1/lock.exp (lock_test_continue): After exiting the loop,
+       send the process a signal before waiting for it to die.
+
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS

diff --git a/src/lib/kadm5/unit-test/api.1/lock.exp b/src/lib/kadm5/unit-test/api.1/lock.exp
index 6adef59817126808d7b8073ada36762e35abd083..bd3fde022977d9de28a5d1e2f925024caeb100bd 100644 (file)
--- a/src/lib/kadm5/unit-test/api.1/lock.exp
+++ b/src/lib/kadm5/unit-test/api.1/lock.exp
@@ -110,6 +110,8 @@ proc lock_test_continue {test my_spawn_id test_failed fail_output cont cmds} {
        if {$test_failed == 1} { break }
     }
 
+    # In timeout cases, the process may not be dead yet.
+    catch { exec kill -9 [exp_pid -i $spawn_id] } x
     set ret [wait -i $spawn_id]
     verbose "% Exit $ret" 2