Skip to content

Build: Support make test when PROG_SUFFIX is used #2885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2025
+9 −3
Merged

Build: Support make test when PROG_SUFFIX is used #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ distclean: clean
.PHONY: distclean

test: $(SERVER_NAME) $(ENGINE_CHECK_AOF_NAME) $(ENGINE_CHECK_RDB_NAME) $(ENGINE_CLI_NAME) $(ENGINE_BENCHMARK_NAME)
@(cd ..; ./runtest)
@(cd ..; VALKEY_PROG_SUFFIX="$(PROG_SUFFIX)" ./runtest)

test-unit: $(ENGINE_UNIT_TESTS)
./$(ENGINE_UNIT_TESTS)
Expand Down
10 changes: 8 additions & 2 deletions tests/support/set_executable_path.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ if {[info exists ::env(VALKEY_BIN_DIR)]} {
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.
set ::VALKEY_PROG_SUFFIX [expr {
[info exists ::env(VALKEY_PROG_SUFFIX)] ? $::env(VALKEY_PROG_SUFFIX) : ""
}]

# Helper to build absolute paths
proc valkey_bin_absolute_path {name} {
set p [file join $::VALKEY_BIN_DIR $name]
return $p
set full_name "${name}${::VALKEY_PROG_SUFFIX}"
return [file join $::VALKEY_BIN_DIR $full_name]
}

set ::VALKEY_SERVER_BIN [valkey_bin_absolute_path "valkey-server"]
Expand Down
Loading