tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Make diff invocation more portable. 

POSIX does not require diff to have -N, so compare in both directions
with just -r, which should catch missing files in either directory.

OpenBSD-Regress-ID: 0e2ec8594556a6f369ed5a0a90c6806419b845f7
This commit is contained in:
dtucker@openbsd.org 2021-08-06 09:00:18 +00:00 committed by Darren Tucker
parent d247a73ce2
commit 395d8fbdb0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
regress/scp3.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: scp3.sh,v 1.1 2021/08/04 21:28:00 djm Exp $ # $OpenBSD: scp3.sh,v 1.2 2021/08/06 09:00:18 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="scp3" tid="scp3"
@ -44,7 +44,8 @@ for mode in scp ; do
rm -rf ${DIR2} rm -rf ${DIR2}
cp ${DATA} ${DIR}/copy cp ${DATA} ${DIR}/copy
$SCP $scpopts -3r hostA:${DIR} hostB:${DIR2} || fail "copy failed" $SCP $scpopts -3r hostA:${DIR} hostB:${DIR2} || fail "copy failed"
diff -rN ${DIR} ${DIR2} || fail "corrupted copy" diff -r ${DIR} ${DIR2} || fail "corrupted copy"
diff -r ${DIR2} ${DIR} || fail "corrupted copy"
verbose "$tag: detect non-directory target" verbose "$tag: detect non-directory target"
scpclean scpclean