Commit c2453354 authored by Niels Möller's avatar Niels Möller
Browse files

* src/testsuite/functions.sh: --capture-to option renamed to

--host-db-update.
* src/testsuite/lsh-9-test: Likewise.
* src/testsuite/rapid7-lsh-test: Likewise.

Rev: src/testsuite/functions.sh:1.51
Rev: src/testsuite/lsh-9-test:1.3
Rev: src/testsuite/rapid7-lsh-test:1.9
parent c50dca66
......@@ -149,19 +149,19 @@ run_lsh () {
shift
echo "$cmd" | HOME="$TEST_HOME" ../lsh -nt $LSH_FLAGS \
--no-use-gateway --sloppy-host-authentication \
--capture-to /dev/null -p $PORT "$@" localhost
--host-db-update /dev/null -p $PORT "$@" localhost
}
stdin_lsh () {
HOME="$TEST_HOME" ../lsh -nt $LSH_FLAGS \
--no-use-gateway --sloppy-host-authentication \
--capture-to /dev/null -p $PORT "$@" localhost
--host-db-update /dev/null -p $PORT "$@" localhost
}
exec_lsh () {
HOME="$TEST_HOME" ../lsh $LSH_FLAGS --sloppy-host-authentication \
--no-use-gateway \
--capture-to /dev/null -z -p $PORT localhost "$@"
--host-db-update /dev/null -z -p $PORT localhost "$@"
}
# FIXME: Use -B
......@@ -169,7 +169,7 @@ spawn_lsh () {
# echo spawn_lsh "$@"
HOME="$TEST_HOME" ../lsh $LSH_FLAGS -nt --sloppy-host-authentication \
--no-use-gateway \
--capture-to /dev/null -z -p $PORT "$@" --write-pid -B localhost > "$LSH_PIDFILE"
--host-db-update /dev/null -z -p $PORT "$@" --write-pid -B localhost > "$LSH_PIDFILE"
at_exit 'kill `cat $LSH_PIDFILE`'
}
......
......@@ -8,7 +8,7 @@ fi
. $srcdir/functions.sh
LSHFLAGS="-nt -p $PORT --sloppy-host-authentication --capture-to /dev/null $LSH_FLAGS"
LSHFLAGS="-nt -p $PORT --sloppy-host-authentication --host-db-update /dev/null $LSH_FLAGS"
export LSHFLAGS
spawn_lshd && HOME=$TEST_HOME ../lsh localhost true && test_success
......
......@@ -23,7 +23,7 @@ for f in $srcdir/rapid7-ssh-pdu/*.pdu ; do
ln -s $f current || die "Creating symlink current -> $f failed"
set +e
HOME="$TEST_HOME" ../lsh -q --sloppy --capture-to=/dev/null -p $PORT localhost exit 0
HOME="$TEST_HOME" ../lsh -q --sloppy --host-db-update=/dev/null -p $PORT localhost exit 0
status="$?"
set -e
# Should be either 1 or 17 (not sure exactly when
......
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