diff options
-rw-r--r-- | regress/connect.sh | 4 | ||||
-rw-r--r-- | regress/multiplex.sh | 4 | ||||
-rw-r--r-- | regress/test-exec.sh | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/regress/connect.sh b/regress/connect.sh index 5e492b86d..46f12b7b3 100644 --- a/regress/connect.sh +++ b/regress/connect.sh | |||
@@ -1,10 +1,8 @@ | |||
1 | # $OpenBSD: connect.sh,v 1.7 2020/01/24 10:08:17 dtucker Exp $ | 1 | # $OpenBSD: connect.sh,v 1.8 2020/01/25 02:57:53 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="simple connect" | 4 | tid="simple connect" |
5 | 5 | ||
6 | NC=nc | ||
7 | |||
8 | start_sshd | 6 | start_sshd |
9 | 7 | ||
10 | trace "direct connect" | 8 | trace "direct connect" |
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index f93310ed8..817ddbfa8 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.31 2020/01/25 00:27:56 dtucker Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.32 2020/01/25 02:57:53 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | make_tmpdir | 4 | make_tmpdir |
@@ -6,8 +6,6 @@ CTL=${SSH_REGRESS_TMP}/ctl-sock | |||
6 | 6 | ||
7 | tid="connection multiplexing" | 7 | tid="connection multiplexing" |
8 | 8 | ||
9 | NC=$OBJ/netcat | ||
10 | |||
11 | trace "will use ProxyCommand $proxycmd" | 9 | trace "will use ProxyCommand $proxycmd" |
12 | if config_defined DISABLE_FD_PASSING ; then | 10 | if config_defined DISABLE_FD_PASSING ; then |
13 | echo "skipped (not supported on this platform)" | 11 | echo "skipped (not supported on this platform)" |
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index fa92ee45a..2c9c3f498 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.73 2020/01/24 01:29:23 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.74 2020/01/25 02:57:53 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -80,6 +80,9 @@ PLINK=plink | |||
80 | PUTTYGEN=puttygen | 80 | PUTTYGEN=puttygen |
81 | CONCH=conch | 81 | CONCH=conch |
82 | 82 | ||
83 | # Tools used by multiple tests | ||
84 | NC=$OBJ/netcat | ||
85 | |||
83 | if [ "x$TEST_SSH_SSH" != "x" ]; then | 86 | if [ "x$TEST_SSH_SSH" != "x" ]; then |
84 | SSH="${TEST_SSH_SSH}" | 87 | SSH="${TEST_SSH_SSH}" |
85 | fi | 88 | fi |