From 7cc17ed8ff71590d5aa5765d306c0814002b6476 Mon Sep 17 00:00:00 2001 From: Premysl Hruby Date: Tue, 3 Apr 2012 13:32:49 +0200 Subject: [PATCH 1/2] new option for choosing number of test clients to run --- tests/test_helper.tcl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl index 34d96606d..2ec3aad1c 100644 --- a/tests/test_helper.tcl +++ b/tests/test_helper.tcl @@ -345,6 +345,7 @@ proc print_help_screen {} { "--quiet Don't show individual tests." "--single Just execute the specified unit (see next option)." "--list-tests List all the available test units." + "--clients 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 From 9184f8fd006ab608b5e6f9b0fa45490d08ff443a Mon Sep 17 00:00:00 2001 From: Premysl Hruby Date: Tue, 3 Apr 2012 14:18:35 +0200 Subject: [PATCH 2/2] in kill_server send the signal once, then wait for up to 5sec before sending lethal SIGKILL --- tests/support/server.tcl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/support/server.tcl b/tests/support/server.tcl index 984270adb..b1ab38fc1 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -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 }