summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regress/scp.sh20
2 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 377e6242b..4cdd5714d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,9 @@
60 [regress/scp-ssh-wrapper.sh] 60 [regress/scp-ssh-wrapper.sh]
61 Fix assumption about how many args scp will pass; ok djm@ 61 Fix assumption about how many args scp will pass; ok djm@
62 NB. ID sync only, we already had this 62 NB. ID sync only, we already had this
63 - djm@cvs.openbsd.org 2006/01/27 06:49:21
64 [scp.sh]
65 regress test for local to local scp copies; ok dtucker@
63 66
6420060129 6720060129
65 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the 68 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
@@ -3785,4 +3788,4 @@
3785 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3788 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3786 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3789 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3787 3790
3788$Id: ChangeLog,v 1.4108 2006/01/31 11:03:11 djm Exp $ 3791$Id: ChangeLog,v 1.4109 2006/01/31 11:05:23 djm Exp $
diff --git a/regress/scp.sh b/regress/scp.sh
index 1043b8ea2..02f541011 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: scp.sh,v 1.4 2005/06/30 11:02:37 markus Exp $ 1# $OpenBSD: scp.sh,v 1.5 2006/01/27 06:49:21 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="scp" 4tid="scp"
@@ -28,6 +28,11 @@ scpclean() {
28 mkdir ${DIR} ${DIR2} 28 mkdir ${DIR} ${DIR2}
29} 29}
30 30
31verbose "$tid: simple copy local file to local file"
32scpclean
33$SCP $scpopts ${DATA} ${COPY} || fail "copy failed"
34cmp ${DATA} ${COPY} || fail "corrupted copy"
35
31verbose "$tid: simple copy local file to remote file" 36verbose "$tid: simple copy local file to remote file"
32scpclean 37scpclean
33$SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed" 38$SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed"
@@ -44,6 +49,12 @@ cp ${DATA} ${COPY}
44$SCP $scpopts ${COPY} somehost:${DIR} || fail "copy failed" 49$SCP $scpopts ${COPY} somehost:${DIR} || fail "copy failed"
45cmp ${COPY} ${DIR}/copy || fail "corrupted copy" 50cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
46 51
52verbose "$tid: simple copy local file to local dir"
53scpclean
54cp ${DATA} ${COPY}
55$SCP $scpopts ${COPY} ${DIR} || fail "copy failed"
56cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
57
47verbose "$tid: simple copy remote file to local dir" 58verbose "$tid: simple copy remote file to local dir"
48scpclean 59scpclean
49cp ${DATA} ${COPY} 60cp ${DATA} ${COPY}
@@ -57,6 +68,13 @@ cp ${DATA} ${DIR}/copy
57$SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" 68$SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed"
58diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" 69diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
59 70
71verbose "$tid: recursive local dir to local dir"
72scpclean
73rm -rf ${DIR2}
74cp ${DATA} ${DIR}/copy
75$SCP $scpopts -r ${DIR} ${DIR2} || fail "copy failed"
76diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
77
60verbose "$tid: recursive remote dir to local dir" 78verbose "$tid: recursive remote dir to local dir"
61scpclean 79scpclean
62rm -rf ${DIR2} 80rm -rf ${DIR2}