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

diff --git a/regress/connect.sh b/regress/connect.sh
index 5e492b86d024fb3d0dd1c002cfb7eca995223588..46f12b7b3c9266d4bcdb4500a9343125fd3ebb01 100644 (file)
--- a/regress/connect.sh
+++ b/regress/connect.sh
@@ -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"

diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index f93310ed8d2c53b76891a58beb331182f7beffe9..817ddbfa819bf8e56016d0d437f32b14fee4e34a 100644 (file)
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -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)"

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index fa92ee45a3c0cafe2c3b49f8b642ac6aa109a96d..2c9c3f49809b72ba532b192f1d56e6ce0d31155e 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -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