- (dtucker) [regress/scp.sh] Make this work on Cygwin too, which doesn't like

   files ending in .exe that aren't binaries; patch from vinschen at redhat.com.

2 files changed, 8 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index c2c0a6ac..0680b220 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@
  - (dtucker) [regress/dynamic-forward.sh] Allow time for connections to be torn
    down, needed on some platforms, should be harmless on others.  Patch from
    jason at devrandom.org.
+ - (dtucker) [regress/scp.sh] Make this work on Cygwin too, which doesn't like
+   files ending in .exe that aren't binaries; patch from vinschen at redhat.com.
 
 20040828
  - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
@@ -1697,4 +1699,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3531 2004/08/29 07:14:31 dtucker Exp $
+$Id: ChangeLog,v 1.3532 2004/08/29 09:39:09 dtucker Exp $
diff --git a/regress/scp.sh b/regress/scp.sh
index 703cc089..6b566428 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -12,16 +12,16 @@ else
 	DIFFOPT="-r"
 fi
 
-DATA=/bin/ls
+DATA=/bin/ls${EXEEXT}
 COPY=${OBJ}/copy
 COPY2=${OBJ}/copy2
 DIR=${COPY}.dd
 DIR2=${COPY}.dd2
 
 SRC=`dirname ${SCRIPT}`
-cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.exe
-chmod 755 ${OBJ}/scp-ssh-wrapper.exe
-scpopts="-q -S ${OBJ}/scp-ssh-wrapper.exe"
+cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp
+chmod 755 ${OBJ}/scp-ssh-wrapper.scp
+scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp"
 
 scpclean() {
 	rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
@@ -79,4 +79,4 @@ for i in 0 1 2 3 4; do
 done
 
 scpclean
-rm -f ${OBJ}/scp-ssh-wrapper.exe
+rm -f ${OBJ}/scp-ssh-wrapper.scp