Merge remote-tracking branch 'origin/unstable' into make-prog-suffix

# Conflicts:
#	tests/support/set_executable_path.tcl

Author: zhijun42

tests/support/set_executable_path.tcl

@@ -1,14 +1,12 @@
 # Set the directory to find Valkey binaries for tests. Historically we've been
 # using make to build binaries under the src/ directory. Since we start supporting
-# CMake as well, we allow changing base dir by passing ENV variable `VALKEY_BIN_DIR`.
-# This must be an absolute path.
-set ::VALKEY_BIN_DIR [expr {[info exists ::env(VALKEY_BIN_DIR)] ? $::env(VALKEY_BIN_DIR) : "[pwd]/src"}]
-
-# Optional program suffix (e.g. `make PROG_SUFFIX=-alt` will create binary valkey-server-alt).
-# Passed from `make test` as environment variable VALKEY_PROG_SUFFIX.
-set ::VALKEY_PROG_SUFFIX [expr {
-    [info exists ::env(VALKEY_PROG_SUFFIX)] ? $::env(VALKEY_PROG_SUFFIX) : ""
-}]
+# CMake as well, we allow changing base dir by passing ENV variable `VALKEY_BIN_DIR`,
+# which could be either absolute or relative path (e.g. cmake-build-debug/bin).
+if {[info exists ::env(VALKEY_BIN_DIR)]} {
+    set ::VALKEY_BIN_DIR [file normalize $::env(VALKEY_BIN_DIR)]
+} else {
+    set ::VALKEY_BIN_DIR "[pwd]/src"
+}
 
 # Optional program suffix (e.g. `make PROG_SUFFIX=-alt` will create binary valkey-server-alt).
 # Passed from `make test` as environment variable VALKEY_PROG_SUFFIX.