From 00ef5b4d9c2fa77975ce67a09993e0cdcf319e47 Mon Sep 17 00:00:00 2001 From: "tgauth@bu.edu" Date: Wed, 29 Nov 2023 11:41:35 -0500 Subject: [PATCH] remove sym link part of scp bash tests on Windows --- regress/scp.sh | 4 ++++ regress/scp3.sh | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/regress/scp.sh b/regress/scp.sh index ec7e2dccf..d95e94773 100644 --- a/regress/scp.sh +++ b/regress/scp.sh @@ -35,10 +35,14 @@ forest() { scpclean rm -rf ${DIR2} cp ${DATA} ${DIR}/copy +if [ "$os" != "windows" ]; then ln -s ${DIR}/copy ${DIR}/copy-sym +fi mkdir ${DIR}/subdir cp ${DATA} ${DIR}/subdir/copy +if [ "$os" != "windows" ]; then ln -s ${DIR}/subdir ${DIR}/subdir-sym +fi } for mode in scp sftp ; do diff --git a/regress/scp3.sh b/regress/scp3.sh index 09dac55e5..c87701344 100644 --- a/regress/scp3.sh +++ b/regress/scp3.sh @@ -25,10 +25,14 @@ forest() { scpclean rm -rf ${DIR2} cp ${DATA} ${DIR}/copy +if [ "$os" != "windows" ]; then ln -s ${DIR}/copy ${DIR}/copy-sym +fi mkdir ${DIR}/subdir cp ${DATA} ${DIR}/subdir/copy +if [ "$os" != "windows" ]; then ln -s ${DIR}/subdir ${DIR}/subdir-sym +fi } for mode in scp sftp ; do @@ -63,7 +67,7 @@ for mode in scp sftp ; do verbose "$tag: recursive remote dir to remote dir" forest - $SCP $scpopts -3r hostA:${DIR} hostB:${DIR2} || fail "copy failed" + $SCP "${scpopts[@]}" -3r hostA:${DIR} hostB:${DIR2} || fail "copy failed" diff -r ${DIR} ${DIR2} || fail "corrupted copy" diff -r ${DIR2} ${DIR} || fail "corrupted copy"