gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

tests should use the new binary name

Browse Source 
Former-commit-id: b4ee3c4ea57041d7c87ec228994ff5397bb6139f
This commit is contained in:
John Sully 2019-12-19 17:13:51 -05:00
parent 9f37260413
commit a0a33f7607
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/instances.tcl
View File

@ -38,7 +38,7 @@ if {[catch {cd tmp}]} {
# the provided configuration file. Returns the PID of the process. # the provided configuration file. Returns the PID of the process.
proc exec_instance {type cfgfile} { proc exec_instance {type cfgfile} {
if {$type eq "redis"} { if {$type eq "redis"} {
set prgname keydb-server set prgname keydb-pro-server
} elseif {$type eq "sentinel"} { } elseif {$type eq "sentinel"} {
set prgname keydb-sentinel set prgname keydb-sentinel
} else { } else {

6
tests/support/server.tcl
View File

@ -212,11 +212,11 @@ proc start_server {options {code undefined}} {
set stderr [format "%s/%s" [dict get $config "dir"] "stderr"] set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
if {$::valgrind} { if {$::valgrind} {
set pid [exec valgrind --track-origins=yes --suppressions=src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/keydb-server $config_file > $stdout 2> $stderr &] set pid [exec valgrind --track-origins=yes --suppressions=src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/keydb-pro-server $config_file > $stdout 2> $stderr &]
} elseif ($::stack_logging) { } elseif ($::stack_logging) {
set pid [exec /usr/bin/env MallocStackLogging=1 MallocLogFile=/tmp/malloc_log.txt src/keydb-server $config_file > $stdout 2> $stderr &] set pid [exec /usr/bin/env MallocStackLogging=1 MallocLogFile=/tmp/malloc_log.txt src/keydb-pro-server $config_file > $stdout 2> $stderr &]
} else { } else {
set pid [exec src/keydb-server $config_file > $stdout 2> $stderr &] set pid [exec src/keydb-pro-server $config_file > $stdout 2> $stderr &]
} }
# Tell the test server about this new instance. # Tell the test server about this new instance.

2
tests/support/test.tcl
View File

@ -139,7 +139,7 @@ proc test {name code {okpattern undefined}} {
} }
if {$::traceleaks} { if {$::traceleaks} {
set output [exec leaks keydb-server] set output [exec leaks keydb-pro-server]
if {![string match {*0 leaks*} $output]} { if {![string match {*0 leaks*} $output]} {
send_data_packet $::test_server_fd err "Detected a memory leak in test '$name': $output" send_data_packet $::test_server_fd err "Detected a memory leak in test '$name': $output"
} }