tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

make bash test compatible with Windows

Browse Source
This commit is contained in:
Tess Gauthier 2023-02-07 16:38:17 -05:00
parent 3b2b4a1ee2
commit 9231e35bcc
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
regress/scp.sh
View File

@ -58,7 +58,7 @@ for mode in scp sftp ; do
verbose "$tag: simple copy remote file to local file" verbose "$tag: simple copy remote file to local file"
scpclean scpclean
$SCP "${scpopts[@]}" somehost:${DATA} ${COPY} || fail "copy failed" $SCP -vvv "${scpopts[@]}" somehost:${DATA} ${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy" cmp ${DATA} ${COPY} || fail "corrupted copy"
# In place tests will not work on Windows because of simultaneous read of/write to file # In place tests will not work on Windows because of simultaneous read of/write to file
@ -88,31 +88,6 @@ for mode in scp sftp ; do
$SCP "${scpopts[@]}" somehost:${DATA} ${COPY} || fail "copy failed" $SCP "${scpopts[@]}" somehost:${DATA} ${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy" cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tag: copy local file to remote file in place"
scpclean
cp ${DATA} ${COPY}
$SCP $scpopts ${COPY} somehost:${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tag: copy remote file to local file in place"
scpclean
cp ${DATA} ${COPY}
$SCP $scpopts somehost:${COPY} ${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tag: copy local file to remote file clobber"
scpclean
cat ${DATA} ${DATA} > ${COPY}
$SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed"
ls -l $DATA $COPY
cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tag: copy remote file to local file clobber"
scpclean
cat ${DATA} ${DATA} > ${COPY}
$SCP $scpopts somehost:${DATA} ${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tag: simple copy local file to remote dir" verbose "$tag: simple copy local file to remote dir"
scpclean scpclean
cp ${DATA} ${COPY} cp ${DATA} ${COPY}
@ -154,12 +129,12 @@ for mode in scp sftp ; do
verbose "$tag: unmatched glob file local->remote" verbose "$tag: unmatched glob file local->remote"
scpclean scpclean
$SCP $scpopts ${DATA} somehost:${COPY3} || fail "copy failed" $SCP "${scpopts[@]}" ${DATA} somehost:${COPY3} || fail "copy failed"
cmp ${DATA} ${COPY3} || fail "corrupted copy" cmp ${DATA} ${COPY3} || fail "corrupted copy"
verbose "$tag: unmatched glob file remote->local" verbose "$tag: unmatched glob file remote->local"
# NB. no clean # NB. no clean
$SCP $scpopts somehost:${COPY3} ${COPY2} || fail "copy failed" $SCP "${scpopts[@]}" somehost:${COPY3} ${COPY2} || fail "copy failed"
cmp ${DATA} ${COPY2} || fail "corrupted copy" cmp ${DATA} ${COPY2} || fail "corrupted copy"
verbose "$tag: unmatched glob dir recursive local->remote" verbose "$tag: unmatched glob dir recursive local->remote"
@ -167,13 +142,13 @@ for mode in scp sftp ; do
rm -rf ${DIR3} rm -rf ${DIR3}
cp ${DATA} ${DIR}/copy cp ${DATA} ${DIR}/copy
cp ${DATA} ${DIR}/copy.glob[1234] cp ${DATA} ${DIR}/copy.glob[1234]
$SCP $scpopts -r ${DIR} somehost:${DIR3} || fail "copy failed" $SCP "${scpopts[@]}" -r ${DIR} somehost:${DIR3} || fail "copy failed"
diff ${DIFFOPT} ${DIR} ${DIR3} || fail "corrupted copy" diff ${DIFFOPT} ${DIR} ${DIR3} || fail "corrupted copy"
verbose "$tag: unmatched glob dir recursive remote->local" verbose "$tag: unmatched glob dir recursive remote->local"
# NB. no clean # NB. no clean
rm -rf ${DIR2} rm -rf ${DIR2}
$SCP $scpopts -r somehost:${DIR3} ${DIR2} || fail "copy failed" $SCP "${scpopts[@]}" -r somehost:${DIR3} ${DIR2} || fail "copy failed"
diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
verbose "$tag: shell metacharacters" verbose "$tag: shell metacharacters"
@ -237,5 +212,5 @@ for mode in scp sftp ; do
cmp ${COPY} ${COPY2} >/dev/null && fail "corrupt target" cmp ${COPY} ${COPY2} >/dev/null && fail "corrupt target"
done done
scpclean #scpclean
rm -f ${OBJ}/scp-ssh-wrapper.scp rm -f ${OBJ}/scp-ssh-wrapper.scp