diff options
| author | djm <djm> | 2014-01-24 03:27:04 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-01-24 03:27:04 +0000 |
| commit | 30a80e45ad1b629a5492d244ac0715da56c1dcf7 (patch) | |
| tree | 6bfd429e05ba82530a0844115224640030dfc0aa /regress | |
| parent | cb2a6b4bc0ef35b5b3e93af5e4e165990e58ff43 (diff) | |
| download | openssh-30a80e45ad1b629a5492d244ac0715da56c1dcf7.tar.gz | |
- (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Make
the scp regress test actually test the built scp rather than the one
in $PATH. ok dtucker@
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/scp-ssh-wrapper.sh | 6 | ||||
| -rw-r--r-- | regress/scp.sh | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/regress/scp-ssh-wrapper.sh b/regress/scp-ssh-wrapper.sh index d1005a99..c63bc2bc 100644 --- a/regress/scp-ssh-wrapper.sh +++ b/regress/scp-ssh-wrapper.sh @@ -17,7 +17,7 @@ printname () { } # Discard all but last argument. We use arg later. -while test "$1" != ""; do +while test "x$1" != "x"; do arg="$1" shift done @@ -52,6 +52,8 @@ badserver_4) echo "X" ;; *) - exec $arg + set -- $arg + shift + exec $SCP "$@" ;; esac diff --git a/regress/scp.sh b/regress/scp.sh index 29c5b35d..c2da2a86 100644 --- a/regress/scp.sh +++ b/regress/scp.sh @@ -20,6 +20,7 @@ SRC=`dirname ${SCRIPT}` cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp chmod 755 ${OBJ}/scp-ssh-wrapper.scp scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp" +export SCP # used in scp-ssh-wrapper.scp scpclean() { rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2} |