Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
0934a4df
Commit
0934a4df
authored
Apr 05, 2012
by
Salvatore Sanfilippo
Browse files
Merge pull request #430 from anydot/f-testsuite
Two changes of testsuite (killing redis and new option)
parents
d84f776e
9184f8fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
tests/support/server.tcl
View file @
0934a4df
...
@@ -46,11 +46,16 @@ proc kill_server config {
...
@@ -46,11 +46,16 @@ 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
}
while
{[
is_alive $config
]}
{
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..."
puts
"Waiting for process
$pid
to exit..."
}
}
catch
{
exec kill $pid
}
after 10
after 10
}
}
...
...
tests/test_helper.tcl
View file @
0934a4df
...
@@ -345,6 +345,7 @@ proc print_help_screen {} {
...
@@ -345,6 +345,7 @@ proc print_help_screen {} {
"--quiet Don't show individual tests."
"--quiet Don't show individual tests."
"--single <unit> Just execute the specified unit (see next option)."
"--single <unit> Just execute the specified unit (see next option)."
"--list-tests List all the available test units."
"--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."
"--force-failure Force the execution of a test that always fails."
"--help Print this help screen."
"--help Print this help screen."
}
"
\n
"
]
}
"
\n
"
]
...
@@ -390,6 +391,9 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
...
@@ -390,6 +391,9 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
set ::client 1
set ::client 1
set ::test_server_port $arg
set ::test_server_port $arg
incr j
incr j
}
elseif
{
$opt
eq
{
--clients
}}
{
set ::numclients $arg
incr j
}
elseif
{
$opt
eq
{
--help
}}
{
}
elseif
{
$opt
eq
{
--help
}}
{
print_help_screen
print_help_screen
exit 0
exit 0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment