diff options
| author | Damien Miller <djm@mindrot.org> | 2006-01-31 22:05:23 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-01-31 22:05:23 +1100 |
| commit | 0b996462f842e6b5a5d409ad4538e1779dd69bf6 (patch) | |
| tree | bb0d37ca51af3e434ab2f3c3e215d2020e811538 | |
| parent | 15a815bb6476ddba55508b177773c9c99c6fe46e (diff) | |
- djm@cvs.openbsd.org 2006/01/27 06:49:21
[scp.sh]
regress test for local to local scp copies; ok dtucker@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | regress/scp.sh | 20 |
2 files changed, 23 insertions, 2 deletions
@@ -60,6 +60,9 @@ [regress/scp-ssh-wrapper.sh] Fix assumption about how many args scp will pass; ok djm@ NB. ID sync only, we already had this + - djm@cvs.openbsd.org 2006/01/27 06:49:21 + [scp.sh] + regress test for local to local scp copies; ok dtucker@ 20060129 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the @@ -3785,4 +3788,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4108 2006/01/31 11:03:11 djm Exp $ +$Id: ChangeLog,v 1.4109 2006/01/31 11:05:23 djm Exp $ diff --git a/regress/scp.sh b/regress/scp.sh index 1043b8ea..02f54101 100644 --- a/regress/scp.sh +++ b/regress/scp.sh @@ -1,4 +1,4 @@ -# $OpenBSD: scp.sh,v 1.4 2005/06/30 11:02:37 markus Exp $ +# $OpenBSD: scp.sh,v 1.5 2006/01/27 06:49:21 djm Exp $ # Placed in the Public Domain. tid="scp" @@ -28,6 +28,11 @@ scpclean() { mkdir ${DIR} ${DIR2} } +verbose "$tid: simple copy local file to local file" +scpclean +$SCP $scpopts ${DATA} ${COPY} || fail "copy failed" +cmp ${DATA} ${COPY} || fail "corrupted copy" + verbose "$tid: simple copy local file to remote file" scpclean $SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed" @@ -44,6 +49,12 @@ cp ${DATA} ${COPY} $SCP $scpopts ${COPY} somehost:${DIR} || fail "copy failed" cmp ${COPY} ${DIR}/copy || fail "corrupted copy" +verbose "$tid: simple copy local file to local dir" +scpclean +cp ${DATA} ${COPY} +$SCP $scpopts ${COPY} ${DIR} || fail "copy failed" +cmp ${COPY} ${DIR}/copy || fail "corrupted copy" + verbose "$tid: simple copy remote file to local dir" scpclean cp ${DATA} ${COPY} @@ -57,6 +68,13 @@ cp ${DATA} ${DIR}/copy $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" +verbose "$tid: recursive local dir to local dir" +scpclean +rm -rf ${DIR2} +cp ${DATA} ${DIR}/copy +$SCP $scpopts -r ${DIR} ${DIR2} || fail "copy failed" +diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" + verbose "$tid: recursive remote dir to local dir" scpclean rm -rf ${DIR2} |