diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2018-03-23 13:21:14 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2018-03-23 13:21:14 +1100 |
| commit | b5974de1a1d419e316ffb6524b1b277dda2f3b49 (patch) | |
| tree | a593c5a61303636ae1f90d3ed112efdf86a59095 | |
| parent | dc31e79454e9b9140b33ad380565fdb59b9c4f33 (diff) | |
Provide $OBJ to paths in PuTTY interop tests.
| -rw-r--r-- | regress/putty-ciphers.sh | 2 | ||||
| -rw-r--r-- | regress/putty-kex.sh | 2 | ||||
| -rw-r--r-- | regress/putty-transfer.sh | 4 | ||||
| -rw-r--r-- | regress/test-exec.sh | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh index 419daabb..191a2bda 100644 --- a/regress/putty-ciphers.sh +++ b/regress/putty-ciphers.sh @@ -15,7 +15,7 @@ for c in aes 3des aes128-ctr aes192-ctr aes256-ctr ; do echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c rm -f ${COPY} - env HOME=$PWD ${PLINK} -load cipher_$c -batch -i putty.rsa2 \ + env HOME=$PWD ${PLINK} -load cipher_$c -batch -i ${OBJ}/putty.rsa2 \ cat ${DATA} > ${COPY} if [ $? -ne 0 ]; then fail "ssh cat $DATA failed" diff --git a/regress/putty-kex.sh b/regress/putty-kex.sh index 9d3c6a9f..71c09701 100644 --- a/regress/putty-kex.sh +++ b/regress/putty-kex.sh @@ -14,7 +14,7 @@ for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do ${OBJ}/.putty/sessions/kex_$k echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k - env HOME=$PWD ${PLINK} -load kex_$k -batch -i putty.rsa2 true + env HOME=$PWD ${PLINK} -load kex_$k -batch -i ${OBJ}/putty.rsa2 true if [ $? -ne 0 ]; then fail "KEX $k failed" fi diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh index 50e454cd..4928d453 100644 --- a/regress/putty-transfer.sh +++ b/regress/putty-transfer.sh @@ -15,7 +15,7 @@ for c in 0 1 ; do ${OBJ}/.putty/sessions/compression_$c echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k env HOME=$PWD ${PLINK} -load compression_$c -batch \ - -i putty.rsa2 cat ${DATA} > ${COPY} + -i ${OBJ}/putty.rsa2 cat ${DATA} > ${COPY} if [ $? -ne 0 ]; then fail "ssh cat $DATA failed" fi @@ -26,7 +26,7 @@ for c in 0 1 ; do rm -f ${COPY} dd if=$DATA obs=${s} 2> /dev/null | \ env HOME=$PWD ${PLINK} -load compression_$c \ - -batch -i putty.rsa2 \ + -batch -i ${OBJ}/putty.rsa2 \ "cat > ${COPY}" if [ $? -ne 0 ]; then fail "ssh cat $DATA failed" diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 46558b05..b6169f15 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -527,6 +527,9 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy + PUTTYDIR=${OBJ}/.putty + export PUTTYDIR + REGRESS_INTEROP_PUTTY=yes fi |