Commit 7e3c6405 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(lyskomd_death): Don't listen to the lyskomd spawn id once it has died.

(kill_lyskomd): Ditto.
parent dba516ee
......@@ -870,6 +870,8 @@ proc lyskomd_death {{expected_leaks {}} {reason 5}} {
global test
global any
global nl
global expect_active
global expect_always
talk_to lyskomd
if {$reason == "signal"} {
......@@ -885,6 +887,11 @@ proc lyskomd_death {{expected_leaks {}} {reason 5}} {
timeout { fail "$test (timeout)" }
eof { pass "$test"; wait }
}
unset expect_active($server_id)
unset expect_always($server_id)
unset spawn_id
fix_expect_after
system "cat etc/memory-usage >> usage.all"
check_memory_usage
check_valgrind valgrind-lyskomd.log 1 1 $expected_leaks
......@@ -897,6 +904,9 @@ proc kill_lyskomd {} {
global lyskomd_pid
global test
global spawn_id
global expect_active
global expect_always
global server_id
talk_to lyskomd
system "kill -KILL $lyskomd_pid"
......@@ -905,6 +915,11 @@ proc kill_lyskomd {} {
timeout { fail "$test (timeout)" }
eof { pass "$test"; wait }
}
unset expect_active($server_id)
unset expect_always($server_id)
unset spawn_id
fix_expect_after
release_lock
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment