tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resync PuTTY and Conch path handling with upstream.

Browse Source 
Now that configure finds these for us we can remove these -portable
specific changes.
This commit is contained in:
Darren Tucker 2023-10-20 20:39:03 +11:00
parent ff85becd5f
commit f993bb5835
No known key found for this signature in database
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
regress/test-exec.sh
View File

@ -96,13 +96,13 @@ SCP=scp
SSH_REGRESS_TMP= SSH_REGRESS_TMP=
# Interop testing # Interop testing
PLINK=plink PLINK=/usr/local/bin/plink
PUTTYGEN=puttygen PUTTYGEN=/usr/local/bin/puttygen
CONCH=conch CONCH=/usr/local/bin/conch
DROPBEAR=dropbear DROPBEAR=/usr/local/bin/dropbear
DBCLIENT=dbclient DBCLIENT=/usr/local/bin/dbclient
DROPBEARKEY=dropbearkey DROPBEARKEY=/usr/local/bin/dropbearkey
DROPBEARCONVERT=dropbearconvert DROPBEARCONVERT=/usr/local/bin/dropbearconvert
# Tools used by multiple tests # Tools used by multiple tests
NC=$OBJ/netcat NC=$OBJ/netcat
@ -137,25 +137,13 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then
SCP="${TEST_SSH_SCP}" SCP="${TEST_SSH_SCP}"
fi fi
if [ "x$TEST_SSH_PLINK" != "x" ]; then if [ "x$TEST_SSH_PLINK" != "x" ]; then
# Find real binary, if it exists PLINK="${TEST_SSH_PLINK}"
case "${TEST_SSH_PLINK}" in
/*) PLINK="${TEST_SSH_PLINK}" ;;
*) PLINK=`which ${TEST_SSH_PLINK} 2>/dev/null` ;;
esac
fi fi
if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
# Find real binary, if it exists PUTTYGEN="${TEST_SSH_PUTTYGEN}"
case "${TEST_SSH_PUTTYGEN}" in
/*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;;
*) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;;
esac
fi fi
if [ "x$TEST_SSH_CONCH" != "x" ]; then if [ "x$TEST_SSH_CONCH" != "x" ]; then
# Find real binary, if it exists CONCH="${TEST_SSH_CONCH}"
case "${TEST_SSH_CONCH}" in
/*) CONCH="${TEST_SSH_CONCH}" ;;
*) CONCH=`which ${TEST_SSH_CONCH} 2>/dev/null` ;;
esac
fi fi
if [ "x$TEST_SSH_DROPBEAR" != "x" ]; then if [ "x$TEST_SSH_DROPBEAR" != "x" ]; then
DROPBEAR="${TEST_SSH_DROPBEAR}" DROPBEAR="${TEST_SSH_DROPBEAR}"