Detect tmux at configure time and pass to tests.

ok djm@

diff --git a/Makefile.in b/Makefile.in
index a099b38fc1ec596e2bf908e2912877654a06da76..66f15968928cf8cd3497c2aa7f7ed9412d395b38 100644 (file)
--- 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 916ba032e36dfec9b83e12a7e99b677288124559..86cf56689b61c3196f317d1735c5a5d5cfe38226 100644 (file)
--- 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 2864f50014c8628eb6ebad66c8c2dd1b5faa4701..690794c9ec24ad1dfdb46637ee5fdfc6fffac0dc 100644 (file)
--- 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 f13750eaeaebcfc76e40305f74e10ef497723838..377c726409b2de8822a86d3f6be9977589d2fbc1 100644 (file)
--- 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