From a0a33f7607ef3db9e64bd3cf09641761222a3cc7 Mon Sep 17 00:00:00 2001 From: John Sully Date: Thu, 19 Dec 2019 17:13:51 -0500 Subject: [PATCH] tests should use the new binary name Former-commit-id: b4ee3c4ea57041d7c87ec228994ff5397bb6139f --- tests/instances.tcl | 2 +- tests/support/server.tcl | 6 +++--- tests/support/test.tcl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/instances.tcl b/tests/instances.tcl index b349df7c3..511cc5903 100644 --- a/tests/instances.tcl +++ b/tests/instances.tcl @@ -38,7 +38,7 @@ if {[catch {cd tmp}]} { # the provided configuration file. Returns the PID of the process. proc exec_instance {type cfgfile} { if {$type eq "redis"} { - set prgname keydb-server + set prgname keydb-pro-server } elseif {$type eq "sentinel"} { set prgname keydb-sentinel } else { diff --git a/tests/support/server.tcl b/tests/support/server.tcl index 659fe60f4..e84a80de4 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -212,11 +212,11 @@ proc start_server {options {code undefined}} { set stderr [format "%s/%s" [dict get $config "dir"] "stderr"] 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) { - 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 { - 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. diff --git a/tests/support/test.tcl b/tests/support/test.tcl index 6849cb876..4c9a1ea65 100644 --- a/tests/support/test.tcl +++ b/tests/support/test.tcl @@ -139,7 +139,7 @@ proc test {name code {okpattern undefined}} { } if {$::traceleaks} { - set output [exec leaks keydb-server] + set output [exec leaks keydb-pro-server] if {![string match {*0 leaks*} $output]} { send_data_packet $::test_server_fd err "Detected a memory leak in test '$name': $output" }