fix id

[openssh.git] / regress / test-exec.sh

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 72fc99951e193fe44b234cb32da96b564e916a13..b544489121719ea3edfd16886b065465ec79f9fd 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.34 2008/06/10 15:28:49 dtucker Exp $
+#      $OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -70,8 +70,9 @@ SFTPSERVER=/usr/libexec/openssh/sftp-server
 SCP=scp
 
 # Interop testing
-PLINK=/usr/local/bin/plink
-PUTTYGEN=/usr/local/bin/puttygen
+PLINK=plink
+PUTTYGEN=puttygen
+CONCH=conch
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
        SSH="${TEST_SSH_SSH}"
@@ -114,6 +115,13 @@ if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
        *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;;
        esac
 fi
+if [ "x$TEST_SSH_CONCH" != "x" ]; then
+       # Find real binary, if it exists
+       case "${TEST_SSH_CONCH}" in
+       /*) CONCH="${TEST_SSH_CONCH}" ;;
+       *) CONCH=`which ${TEST_SSH_CONCH} 2>/dev/null` ;;
+       esac
+fi
 
 # Path to sshd must be absolute for rexec
 case "$SSHD" in
@@ -287,6 +295,12 @@ for t in rsa rsa1; do
 done
 chmod 644 $OBJ/authorized_keys_$USER
 
+# Activate Twisted Conch tests if the binary is present
+REGRESS_INTEROP_CONCH=no
+if test -x "$CONCH" ; then
+       REGRESS_INTEROP_CONCH=yes
+fi
+
 # If PuTTY is present and we are running a PuTTY test, prepare keys and
 # configuration
 REGRESS_INTEROP_PUTTY=no