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

fix tests

This commit is contained in:
Balu Gajjala 2022-03-11 17:15:47 -08:00
parent 9a8746842a
commit affac5aedc
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
regress/scp3.sh
View File

@ -21,30 +21,40 @@ scpclean() {
}
for mode in scp sftp ; do
scpopts="-F${OBJ}/ssh_proxy -S ${SSH} -q"
tag="$tid: $mode mode"
if test $mode = scp ; then
scpopts="$scpopts -O"
# scpopts should be an array to preverse the double quotes
if [ "$os" == "windows" ]; then
if test $mode = scp ; then
scpopts=(-F${OBJ}/ssh_proxy -S "$TEST_SHELL_PATH ${SSH}" -q -O)
else
scpopts=(-s -D ${SFTPSERVER})
fi
else
scpopts="-s -D ${SFTPSERVER}"
scpopts="-F${OBJ}/ssh_proxy -S ${SSH} -q"
if test $mode = scp ; then
scpopts="$scpopts -O"
else
scpopts="-s -D ${SFTPSERVER}"
fi
fi
verbose "$tag: simple copy remote file to remote file"
scpclean
$SCP $scpopts -3 hostA:${DATA} hostB:${COPY} || fail "copy failed"
$SCP "${scpopts[@]}" -3 hostA:${DATA} hostB:${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tag: simple copy remote file to remote dir"
scpclean
cp ${DATA} ${COPY}
$SCP $scpopts -3 hostA:${COPY} hostB:${DIR} || fail "copy failed"
$SCP "${scpopts[@]}" -3 hostA:${COPY} hostB:${DIR} || fail "copy failed"
cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
verbose "$tag: recursive remote dir to remote dir"
scpclean
rm -rf ${DIR2}
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 -r ${DIR} ${DIR2} || fail "corrupted copy"
diff -r ${DIR2} ${DIR} || fail "corrupted copy"
@ -52,7 +62,7 @@ for mode in scp sftp ; do
scpclean
echo a > ${COPY}
echo b > ${COPY2}
$SCP $scpopts -3 hostA:${DATA} hostA:${COPY} hostB:${COPY2}
$SCP "${scpopts[@]}" -3 hostA:${DATA} hostA:${COPY} hostB:${COPY2}
cmp ${COPY} ${COPY2} >/dev/null && fail "corrupt target"
done

4
scp.c
View File

@ -376,13 +376,13 @@ do_cmd(char *program, char *host, char *remuser, int port, int subsystem,
{
posix_spawn_file_actions_t actions;
do_cmd_pid = -1;
*pid = -1;
if (posix_spawn_file_actions_init(&actions) != 0 ||
posix_spawn_file_actions_adddup2(&actions, pin[0], STDIN_FILENO) != 0 ||
posix_spawn_file_actions_adddup2(&actions, pout[1], STDOUT_FILENO) != 0 )
fatal("posix_spawn initialization failed");
else if (posix_spawn(&do_cmd_pid, args_dup.list[0], &actions, NULL, args_dup.list, NULL) != 0)
else if (posix_spawn(pid, args_dup.list[0], &actions, NULL, args_dup.list, NULL) != 0)
fatal("posix_spawn: %s", strerror(errno));
posix_spawn_file_actions_destroy(&actions);