diff options
Diffstat (limited to 'tests/support/server.tcl')
| -rw-r--r-- | tests/support/server.tcl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/support/server.tcl b/tests/support/server.tcl index 9f92ce31e..0e2e2982a 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -178,10 +178,10 @@ proc start_server {options {code undefined}} { dict set config $directive $arguments } } - + # use a different directory every time a server is started dict set config dir [tmpdir server] - + # start every server on a different port set ::port [find_available_port [expr {$::port+1}]] dict set config port $::port @@ -190,7 +190,7 @@ proc start_server {options {code undefined}} { foreach {directive arguments} [concat $::global_overrides $overrides] { dict set config $directive $arguments } - + # write new configuration to temporary file set config_file [tmpfile redis.conf] set fp [open $config_file w+] @@ -208,7 +208,7 @@ proc start_server {options {code undefined}} { } else { exec src/redis-server $config_file > $stdout 2> $stderr & } - + # check that the server actually started # ugly but tries to be as fast as possible... if {$::valgrind} {set retrynum 1000} else {set retrynum 100} @@ -233,7 +233,7 @@ proc start_server {options {code undefined}} { start_server_error $config_file $err return } - + # find out the pid while {![info exists pid]} { regexp {PID:\s(\d+)} [exec cat $stdout] _ pid |