From ff32d7c9d20d42db364525d92c27a7c7491caf0d Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 30 Jun 2012 15:04:13 +1000
Subject:    - djm@cvs.openbsd.org 2012/06/01 00:52:52     
 [regress/sftp-cmds.sh]      don't delete .* on cleanup due to unintended env
 expansion; pointed out in      bz#2014 by openssh AT roumenpetrov.info

---
 regress/sftp-cmds.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'regress/sftp-cmds.sh')

diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 1c67b6476..d10d01a31 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: sftp-cmds.sh,v 1.11 2010/12/04 00:21:19 djm Exp $
+#	$OpenBSD: sftp-cmds.sh,v 1.12 2012/06/01 00:52:52 djm Exp $
 #	Placed in the Public Domain.
 
 # XXX - TODO: 
@@ -40,7 +40,7 @@ SPACECOPY_ARG="${COPY}\ this\ has\ spaces.txt"
 # File with glob metacharacters
 GLOBMETACOPY="${COPY} [metachar].txt"
 
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
 mkdir ${COPY}.dd
 
 verbose "$tid: lls"
@@ -242,7 +242,7 @@ verbose "$tid: lchdir"
 echo "lchdir ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \
 	|| fail "lchdir failed"
 
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
 rm -rf ${QUOTECOPY} "$SPACECOPY" "$GLOBMETACOPY"
 
 
-- 
cgit v1.2.3


From ec1e15d51a202c95a6414375ae71c461a16ff870 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 3 Jul 2012 01:06:49 +1000
Subject:  - (dtucker) [regress/reexec.sh regress/sftp-cmds.sh
 regress/test-exec.sh]    Move cygwin detection to test-exec and use to skip
 reexec test on cygwin.

---
 ChangeLog            |  2 ++
 regress/reexec.sh    |  5 ++++-
 regress/sftp-cmds.sh | 14 --------------
 regress/test-exec.sh |  7 +++++++
 4 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'regress/sftp-cmds.sh')

diff --git a/ChangeLog b/ChangeLog
index b55f6ba9e..1b69cd3cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
    - dtucker@cvs.openbsd.org 2012/07/02 14:37:06
      [regress/connect-privsep.sh]
      remove exit from end of test since it prevents reporting failure
+ - (dtucker) [regress/reexec.sh regress/sftp-cmds.sh regress/test-exec.sh]
+   Move cygwin detection to test-exec and use to skip reexec test on cygwin.
 
 20120629
  - OpenBSD CVS Sync
diff --git a/regress/reexec.sh b/regress/reexec.sh
index 6edfc318e..9464eb699 100644
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@@ -46,6 +46,9 @@ rm -f $PIDFILE
 
 cp $OBJ/sshd_config.orig $OBJ/sshd_config
 
+# cygwin can't fork a deleted binary
+if [ "$os" != "cygwin" ]; then
+
 verbose "test reexec fallback"
 
 start_sshd_copy
@@ -69,4 +72,4 @@ copy_tests
 $SUDO kill `$SUDO cat $PIDFILE`
 rm -f $PIDFILE
 
-
+fi
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index d10d01a31..2e0300e16 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -17,20 +17,6 @@ do
 	fi
 done
 
-if have_prog uname
-then
-	case `uname` in
-	CYGWIN*)
-		os=cygwin
-		;;
-	*)
-		os=`uname`
-		;;
-	esac
-else
-	os="unknown"
-fi
-
 # Path with embedded quote
 QUOTECOPY=${COPY}".\"blah\""
 QUOTECOPY_ARG=${COPY}'.\"blah\"'
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 092cfed5b..514fffb16 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -12,6 +12,13 @@ OSF1*)
 	BIN_SH=xpg4
 	export BIN_SH
 	;;
+CYGWIN_5.0)
+	os=cygwin
+	TEST_SSH_IPV6=no
+	;;
+CYGWIN*)
+	os=cygwin
+	;;
 esac
 
 if [ ! -z "$TEST_SSH_PORT" ]; then
-- 
cgit v1.2.3