[openssh-commits] [openssh] 02/02: Detect tmux at configure time and pass to tests.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit a750ec60782d21db69383344dda478342d40ffa1
Author: Darren Tucker <dtucker at dtucker.net>
AuthorDate: Mon Oct 20 18:31:08 2025 +1100

    Detect tmux at configure time and pass to tests.
    
    ok djm@
---
 Makefile.in          | 1 +
 configure.ac         | 1 +
 regress/ssh-tty.sh   | 2 +-
 regress/test-exec.sh | 3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index a099b38fc..66f159689 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -818,6 +818,7 @@ interop-tests t-exec file-tests extra-tests: regress-prep regress-binaries $(TAR
 		TEST_SSH_DROPBEARKEY="@DROPBEARKEY@" \
 		TEST_SSH_DROPBEARCONVERT="@DROPBEARCONVERT@" \
 		TEST_SSH_DBCLIENT="@DBCLIENT@" \
+		TEST_SSH_TMUX="@TMUX@" \
 		TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
 		TEST_SSH_UTF8="@TEST_SSH_UTF8@" \
 		TEST_SHELL="$(TEST_SHELL)" \
diff --git a/configure.ac b/configure.ac
index 916ba032e..86cf56689 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5825,6 +5825,7 @@ AC_PATH_PROG([DROPBEAR], [dropbear])
 AC_PATH_PROG([DBCLIENT], [dbclient])
 AC_PATH_PROG([DROPBEARKEY], [dropbearkey])
 AC_PATH_PROG([DROPBEARCONVERT], [dropbearconvert])
+AC_PATH_PROG([TMUX], [tmux])
 
 CFLAGS="${CFLAGS} ${CFLAGS_AFTER}"
 LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}"
diff --git a/regress/ssh-tty.sh b/regress/ssh-tty.sh
index 2864f5001..690794c9e 100644
--- a/regress/ssh-tty.sh
+++ b/regress/ssh-tty.sh
@@ -11,7 +11,7 @@ rm -rf "$FAKEHOME"
 mkdir -m 0700 -p "$FAKEHOME"
 
 # tmux stuff
-TMUX=tmux
+TMUX=${TMUX:-tmux}
 test -x $TMUX || skip "tmux not found"
 CLEANENV="env -i HOME=$HOME LOGNAME=$USER USER=$USER PATH=$PATH SHELL=$SHELL"
 TMUX_TEST="$CLEANENV $TMUX -f/dev/null -Lopenssh-regress-ssh-tty"
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index f13750eae..377c72640 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -168,6 +168,9 @@ fi
 if [ "x$TEST_SSH_DROPBEARCONVERT" != "x" ]; then
 	DROPBEARCONVERT="${TEST_SSH_DROPBEARCONVERT}"
 fi
+if [ "x$TEST_SSH_TMUX" != "x" ]; then
+	TMUX="${TEST_SSH_TMUX}"
+fi
 if [ "x$TEST_SSH_PKCS11_HELPER" != "x" ]; then
 	SSH_PKCS11_HELPER="${TEST_SSH_PKCS11_HELPER}"
 fi

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.