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
a53ebb4c
Commit
a53ebb4c
authored
Aug 21, 2010
by
Pieter Noordhuis
Browse files
Don't abort test suite when the server block has a return value
parent
87c74dfa
Changes
1
Show whitespace changes
Inline
Side-by-side
tests/support/server.tcl
View file @
a53ebb4c
...
@@ -230,7 +230,11 @@ proc start_server {options {code undefined}} {
...
@@ -230,7 +230,11 @@ proc start_server {options {code undefined}} {
# execute provided block
# execute provided block
set curnum $::testnum
set curnum $::testnum
catch
{
uplevel 1 $code
}
err
if
{
!
[
catch
{
uplevel 1 $code
}
err
]}
{
# zero exit status is good
unset err
}
if
{
$curnum
== $::testnum
}
{
if
{
$curnum
== $::testnum
}
{
# don't check for leaks when no tests were executed
# don't check for leaks when no tests were executed
dict set srv
"skipleaks"
1
dict set srv
"skipleaks"
1
...
@@ -241,6 +245,7 @@ proc start_server {options {code undefined}} {
...
@@ -241,6 +245,7 @@ proc start_server {options {code undefined}} {
# allow an exception to bubble up the call chain but still kill this
# allow an exception to bubble up the call chain but still kill this
# server, because we want to reuse the ports when the tests are re-run
# server, because we want to reuse the ports when the tests are re-run
if
{[
info exists err
]}
{
if
{
$err
eq
"exception"
}
{
if
{
$err
eq
"exception"
}
{
puts
[
format
"Logged warnings (pid %d):"
[
dict get $srv
"pid"
]]
puts
[
format
"Logged warnings (pid %d):"
[
dict get $srv
"pid"
]]
set warnings
[
warnings_from_file
[
dict get $srv
"stdout"
]]
set warnings
[
warnings_from_file
[
dict get $srv
"stdout"
]]
...
@@ -258,6 +263,7 @@ proc start_server {options {code undefined}} {
...
@@ -258,6 +263,7 @@ proc start_server {options {code undefined}} {
puts $err
puts $err
exit 1
exit 1
}
}
}
set ::tags
[
lrange $::tags 0 end-
[
llength $tags
]]
set ::tags
[
lrange $::tags 0 end-
[
llength $tags
]]
kill_server $srv
kill_server $srv
...
...
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