upstream: Move setting $NC into test-exec since it's now used by

multiple tests, and in -portable we use our own local copy to avoid
portability problems.

OpenBSD-Regress-ID: ceb78445fcaac317bec2fc51b3f0d9589048c114
This commit is contained in:
dtucker@openbsd.org 2020-01-25 02:57:53 +00:00 committed by Darren Tucker
parent e16dfa94f8
commit a0c81d2402
3 changed files with 6 additions and 7 deletions

View File

@ -1,10 +1,8 @@
# $OpenBSD: connect.sh,v 1.7 2020/01/24 10:08:17 dtucker Exp $
# $OpenBSD: connect.sh,v 1.8 2020/01/25 02:57:53 dtucker Exp $
# Placed in the Public Domain.
tid="simple connect"
NC=nc
start_sshd
trace "direct connect"

View File

@ -1,4 +1,4 @@
# $OpenBSD: multiplex.sh,v 1.31 2020/01/25 00:27:56 dtucker Exp $
# $OpenBSD: multiplex.sh,v 1.32 2020/01/25 02:57:53 dtucker Exp $
# Placed in the Public Domain.
make_tmpdir
@ -6,8 +6,6 @@ CTL=${SSH_REGRESS_TMP}/ctl-sock
tid="connection multiplexing"
NC=$OBJ/netcat
trace "will use ProxyCommand $proxycmd"
if config_defined DISABLE_FD_PASSING ; then
echo "skipped (not supported on this platform)"

View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.73 2020/01/24 01:29:23 dtucker Exp $
# $OpenBSD: test-exec.sh,v 1.74 2020/01/25 02:57:53 dtucker Exp $
# Placed in the Public Domain.
#SUDO=sudo
@ -80,6 +80,9 @@ PLINK=plink
PUTTYGEN=puttygen
CONCH=conch
# Tools used by multiple tests
NC=$OBJ/netcat
if [ "x$TEST_SSH_SSH" != "x" ]; then
SSH="${TEST_SSH_SSH}"
fi