summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2024-11-01 09:44:29 +0100
committerDarren Tucker <dtucker@dtucker.net>2024-11-08 06:25:47 +0100
commitdd416f5bfa96ac1ff44b27a93f7b55ee627c6baf (patch)
tree6fa873467445dc3f78589ad564f72056d1c35f7f
parentupstream: ssh-agent implemented an all-or-nothing allow-list of (diff)
downloadopenssh-dd416f5bfa96ac1ff44b27a93f7b55ee627c6baf.tar.xz
openssh-dd416f5bfa96ac1ff44b27a93f7b55ee627c6baf.zip
Allow overridding TEST_SSH_SSHD.
This will allow tests to specify an alternative sshd, eg on a remote machine with different endianness.
-rw-r--r--Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index b42b454de..43cc2c385 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -757,6 +757,8 @@ unit: regress-unit-binaries
OBJ="$(BUILDDIR)/regress" \
$@ && echo $@ tests passed
+TEST_SSH_SSHD="$(BUILDDIR)/sshd"
+
interop-tests t-exec file-tests extra-tests: regress-prep regress-binaries $(TARGETS)
cd $(srcdir)/regress || exit $$?; \
EGREP='@EGREP@' \
@@ -771,7 +773,7 @@ interop-tests t-exec file-tests extra-tests: regress-prep regress-binaries $(TAR
TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
TEST_SSH_SCP="$(BUILDDIR)/scp" \
TEST_SSH_SSH="$(BUILDDIR)/ssh" \
- TEST_SSH_SSHD="$(BUILDDIR)/sshd" \
+ TEST_SSH_SSHD="$(TEST_SSH_SSHD)" \
TEST_SSH_SSHD_SESSION="$(BUILDDIR)/sshd-session" \
TEST_SSH_SSHD_AUTH="$(BUILDDIR)/sshd-auth" \
TEST_SSH_SSHAGENT="$(BUILDDIR)/ssh-agent" \