Commit 38680424 authored by antirez's avatar antirez
Browse files

Test: be more patient waiting for servers to exit.

This should likely fix a false positive when running with the --valgrind
option.
parent 66f9393e
...@@ -54,10 +54,15 @@ proc kill_server config { ...@@ -54,10 +54,15 @@ proc kill_server config {
# kill server and wait for the process to be totally exited # kill server and wait for the process to be totally exited
catch {exec kill $pid} catch {exec kill $pid}
if {$::valgrind} {
set max_wait 60000
} else {
set max_wait 10000
}
while {[is_alive $config]} { while {[is_alive $config]} {
incr wait 10 incr wait 10
if {$wait >= 5000} { if {$wait >= $max_wait} {
puts "Forcing process $pid to exit..." puts "Forcing process $pid to exit..."
catch {exec kill -KILL $pid} catch {exec kill -KILL $pid}
} elseif {$wait % 1000 == 0} { } elseif {$wait % 1000 == 0} {
......
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