summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-11 01:38:52 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-11 01:38:52 +1000
commit5f346649ce02bc58161610bcb455d6cefbb3a830 (patch)
treeed9bc757d6c8a704487d4ad9c6b78b36b44bddc5 /regress
parent75a55bf0c74c13ef596f31f54be421f17cb25e36 (diff)
- dtucker@cvs.openbsd.org 2008/06/10 15:21:41
[test-exec.sh] Use a more portable construct for checking if we're running a putty test
Diffstat (limited to 'regress')
-rw-r--r--regress/test-exec.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 89470682b..f05c671cd 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: test-exec.sh,v 1.32 2008/06/09 18:06:32 dtucker Exp $ 1# $OpenBSD: test-exec.sh,v 1.33 2008/06/10 15:21:41 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4#SUDO=sudo 4#SUDO=sudo
@@ -290,7 +290,15 @@ chmod 644 $OBJ/authorized_keys_$USER
290# If PuTTY is present and we are running a PuTTY test, prepare keys and 290# If PuTTY is present and we are running a PuTTY test, prepare keys and
291# configuration 291# configuration
292REGRESS_INTEROP_PUTTY=no 292REGRESS_INTEROP_PUTTY=no
293if test -x $PUTTYGEN -a -x $PLINK && [[ $SCRIPT = *putty* ]] ; then 293if test -x $PUTTYGEN -a -x $PLINK ; then
294 REGRESS_INTEROP_PUTTY=yes
295fi
296case "$SCRIPT" in
297*putty*) ;;
298*) REGRESS_INTEROP_PUTTY=no ;;
299esac
300
301if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
294 mkdir -p ${OBJ}/.putty 302 mkdir -p ${OBJ}/.putty
295 303
296 # Add a PuTTY key to authorized_keys 304 # Add a PuTTY key to authorized_keys