From: dtucker@openbsd.org Date: Fri, 6 Aug 2021 09:00:18 +0000 (+0000) Subject: upstream: Make diff invocation more portable. X-Git-Tag: V_8_7_P1~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=395d8fbdb094497211e1461cf0e2f80af5617e0a;p=thirdparty%2Fopenssh-portable.git 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 --- diff --git a/regress/scp3.sh b/regress/scp3.sh index e5493ee80..53db81d2b 100644 --- a/regress/scp3.sh +++ b/regress/scp3.sh @@ -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. tid="scp3" @@ -44,7 +44,8 @@ for mode in scp ; do rm -rf ${DIR2} cp ${DATA} ${DIR}/copy $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" scpclean