summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--regress/reexec.sh5
-rw-r--r--regress/sftp-cmds.sh14
-rw-r--r--regress/test-exec.sh7
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 @@
19 - dtucker@cvs.openbsd.org 2012/07/02 14:37:06 19 - dtucker@cvs.openbsd.org 2012/07/02 14:37:06
20 [regress/connect-privsep.sh] 20 [regress/connect-privsep.sh]
21 remove exit from end of test since it prevents reporting failure 21 remove exit from end of test since it prevents reporting failure
22 - (dtucker) [regress/reexec.sh regress/sftp-cmds.sh regress/test-exec.sh]
23 Move cygwin detection to test-exec and use to skip reexec test on cygwin.
22 24
2320120629 2520120629
24 - OpenBSD CVS Sync 26 - 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
46 46
47cp $OBJ/sshd_config.orig $OBJ/sshd_config 47cp $OBJ/sshd_config.orig $OBJ/sshd_config
48 48
49# cygwin can't fork a deleted binary
50if [ "$os" != "cygwin" ]; then
51
49verbose "test reexec fallback" 52verbose "test reexec fallback"
50 53
51start_sshd_copy 54start_sshd_copy
@@ -69,4 +72,4 @@ copy_tests
69$SUDO kill `$SUDO cat $PIDFILE` 72$SUDO kill `$SUDO cat $PIDFILE`
70rm -f $PIDFILE 73rm -f $PIDFILE
71 74
72 75fi
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
17 fi 17 fi
18done 18done
19 19
20if have_prog uname
21then
22 case `uname` in
23 CYGWIN*)
24 os=cygwin
25 ;;
26 *)
27 os=`uname`
28 ;;
29 esac
30else
31 os="unknown"
32fi
33
34# Path with embedded quote 20# Path with embedded quote
35QUOTECOPY=${COPY}".\"blah\"" 21QUOTECOPY=${COPY}".\"blah\""
36QUOTECOPY_ARG=${COPY}'.\"blah\"' 22QUOTECOPY_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*)
12 BIN_SH=xpg4 12 BIN_SH=xpg4
13 export BIN_SH 13 export BIN_SH
14 ;; 14 ;;
15CYGWIN_5.0)
16 os=cygwin
17 TEST_SSH_IPV6=no
18 ;;
19CYGWIN*)
20 os=cygwin
21 ;;
15esac 22esac
16 23
17if [ ! -z "$TEST_SSH_PORT" ]; then 24if [ ! -z "$TEST_SSH_PORT" ]; then