[openssh-commits] [openssh] 01/01: upstream: Move setting $NC into test-exec since it's now used by

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit a0c81d2402eedc514b9c9f25ef9604eb0576b86a
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Sat Jan 25 02:57:53 2020 +0000

    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
---
 regress/connect.sh   | 4 +---
 regress/multiplex.sh | 4 +---
 regress/test-exec.sh | 5 ++++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/regress/connect.sh b/regress/connect.sh
index 5e492b86..46f12b7b 100644
--- 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 f93310ed..817ddbfa 100644
--- 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 fa92ee45..2c9c3f49 100644
--- 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.