- (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.

4 files changed, 13 insertions, 15 deletions

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