summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
Diffstat (limited to 'regress')
-rw-r--r--regress/scp-ssh-wrapper.sh6
-rw-r--r--regress/scp.sh1
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}