Attachment 3648 Details for Bug 3518 – skip scp test

skip scp test

Skip-scp-transfer-over-multiplexed-connection-if-the.patch (text/plain), 1.52 KB, created by renmingshuai on 2023-01-06 03:15:34 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: renmingshuai

Created: 2023-01-06 03:15:34 AEDT

Size: 1.52 KB

patch

obsolete

>From 275f88f57641bf43c54bfec52450137fdb87e580 Mon Sep 17 00:00:00 2001
>From: chengyechun <chengyechun1@huawei.com>
>Date: Fri, 6 Jan 2023 01:04:34 +0800
>Subject: [PATCH] Skip scp transfer over multiplexed connection if there's no
> scp on remote path as scp3 test did
>
>---
> regress/multiplex.sh | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
>diff --git a/regress/multiplex.sh b/regress/multiplex.sh
>index 2950d955..bde427ea 100644
>--- a/regress/multiplex.sh
>+++ b/regress/multiplex.sh
>@@ -77,11 +77,16 @@ echo "get ${DATA} ${COPY}" | \
> test -f ${COPY}			|| fail "sftp: failed copy ${DATA}" 
> cmp ${DATA} ${COPY}		|| fail "sftp: corrupted copy of ${DATA}"
> 
>-rm -f ${COPY}
>-trace "scp transfer over multiplexed connection and check result"
>-${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_REGRESS_LOGFILE 2>&1
>-test -f ${COPY}			|| fail "scp: failed copy ${DATA}" 
>-cmp ${DATA} ${COPY}		|| fail "scp: corrupted copy of ${DATA}"
>+$SSH -F $OBJ/ssh_config otherhost \
>+    'IFS=":"; for i in $PATH;do [ -x "$i/scp" ] && exit 0; done; exit 1'
>+if [ $? -eq 0 ]; then
>+	echo "run scp transfer over multiplexed connection"
>+	rm -f ${COPY}
>+	trace "scp transfer over multiplexed connection and check result"
>+	${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_REGRESS_LOGFILE 2>&1
>+	test -f ${COPY}			|| fail "scp: failed copy ${DATA}" 
>+	cmp ${DATA} ${COPY}		|| fail "scp: corrupted copy of ${DATA}"
>+fi
> 
> rm -f ${COPY}
> verbose "test $tid: forward"
>-- 
>2.33.0
>

Actions: View

Attachments on bug 3518: 3648 | 3649