Commit 0934a4df authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo
Browse files

Merge pull request #430 from anydot/f-testsuite

Two changes of testsuite (killing redis and new option)
parents d84f776e 9184f8fd
......@@ -46,11 +46,16 @@ proc kill_server config {
}
# kill server and wait for the process to be totally exited
catch {exec kill $pid}
while {[is_alive $config]} {
if {[incr wait 10] % 1000 == 0} {
incr wait 10
if {$wait >= 5000} {
puts "Forcing process $pid to exit..."
catch {exec kill -KILL $pid}
} elseif {$wait % 1000 == 0} {
puts "Waiting for process $pid to exit..."
}
catch {exec kill $pid}
after 10
}
......
......@@ -345,6 +345,7 @@ proc print_help_screen {} {
"--quiet Don't show individual tests."
"--single <unit> Just execute the specified unit (see next option)."
"--list-tests List all the available test units."
"--clients <num> Number of test clients (16)."
"--force-failure Force the execution of a test that always fails."
"--help Print this help screen."
} "\n"]
......@@ -390,6 +391,9 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
set ::client 1
set ::test_server_port $arg
incr j
} elseif {$opt eq {--clients}} {
set ::numclients $arg
incr j
} elseif {$opt eq {--help}} {
print_help_screen
exit 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