Commit b0e0f760 authored by Damien Miller's avatar Damien Miller

- (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@
parent 42a09253
20130124
- (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@
20130123 20130123
- (tim) [session.c] Improve error reporting on set_id(). - (tim) [session.c] Improve error reporting on set_id().
- (dtucker) [configure.ac] NetBSD's (and FreeBSD's) strnvis is gratuitously - (dtucker) [configure.ac] NetBSD's (and FreeBSD's) strnvis is gratuitously
......
# $Id: Makefile.in,v 1.350 2014/01/17 05:47:04 djm Exp $ # $Id: Makefile.in,v 1.351 2014/01/24 03:27:04 djm Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh # uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@ #SHELL = @SH@
...@@ -411,6 +411,7 @@ regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c ...@@ -411,6 +411,7 @@ regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c
tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT)
BUILDDIR=`pwd`; \ BUILDDIR=`pwd`; \
TEST_SHELL="@TEST_SHELL@"; \ TEST_SHELL="@TEST_SHELL@"; \
TEST_SSH_SCP="$${BUILDDIR}/scp"; \
TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
...@@ -434,6 +435,7 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) ...@@ -434,6 +435,7 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT)
PATH="$${BUILDDIR}:$${PATH}" \ PATH="$${BUILDDIR}:$${PATH}" \
TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
TEST_SHELL="$${TEST_SHELL}" \ TEST_SHELL="$${TEST_SHELL}" \
TEST_SSH_SCP="$${TEST_SSH_SCP}" \
TEST_SSH_SSH="$${TEST_SSH_SSH}" \ TEST_SSH_SSH="$${TEST_SSH_SSH}" \
TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
......
...@@ -17,7 +17,7 @@ printname () { ...@@ -17,7 +17,7 @@ printname () {
} }
# Discard all but last argument. We use arg later. # Discard all but last argument. We use arg later.
while test "$1" != ""; do while test "x$1" != "x"; do
arg="$1" arg="$1"
shift shift
done done
...@@ -52,6 +52,8 @@ badserver_4) ...@@ -52,6 +52,8 @@ badserver_4)
echo "X" echo "X"
;; ;;
*) *)
exec $arg set -- $arg
shift
exec $SCP "$@"
;; ;;
esac esac
...@@ -20,6 +20,7 @@ SRC=`dirname ${SCRIPT}` ...@@ -20,6 +20,7 @@ SRC=`dirname ${SCRIPT}`
cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp
chmod 755 ${OBJ}/scp-ssh-wrapper.scp chmod 755 ${OBJ}/scp-ssh-wrapper.scp
scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp" scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp"
export SCP # used in scp-ssh-wrapper.scp
scpclean() { scpclean() {
rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2} rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment