diff options
author | Damien Miller <djm@mindrot.org> | 2004-06-18 01:23:03 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-06-18 01:23:03 +1000 |
commit | e826a8c9d9ea8de6696ca95825d69cf02e1954d6 (patch) | |
tree | 5bb1c773b5e40414057530250f222af59ccc3d0a | |
parent | 23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0 (diff) |
- djm@cvs.openbsd.org 2004/06/17 14:53:27
[regress/multiplex.sh]
shared connection env passing regress test
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/multiplex.sh | 13 |
2 files changed, 15 insertions, 3 deletions
@@ -7,6 +7,9 @@ | |||
7 | [clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5] | 7 | [clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5] |
8 | Add option for confirmation (ControlMaster=ask) via ssh-askpass before | 8 | Add option for confirmation (ControlMaster=ask) via ssh-askpass before |
9 | opening shared connections; ok markus@ | 9 | opening shared connections; ok markus@ |
10 | - djm@cvs.openbsd.org 2004/06/17 14:53:27 | ||
11 | [regress/multiplex.sh] | ||
12 | shared connection env passing regress test | ||
10 | 13 | ||
11 | 20040617 | 14 | 20040617 |
12 | - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some | 15 | - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some |
@@ -1280,4 +1283,4 @@ | |||
1280 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1283 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1281 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1284 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1282 | 1285 | ||
1283 | $Id: ChangeLog,v 1.3406 2004/06/17 15:19:03 djm Exp $ | 1286 | $Id: ChangeLog,v 1.3407 2004/06/17 15:23:03 djm Exp $ |
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index 8605d5e0b..c19c0fe17 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.5 2004/06/17 06:19:06 dtucker Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.6 2004/06/17 14:53:27 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | CTL=$OBJ/ctl-sock | 4 | CTL=$OBJ/ctl-sock |
@@ -11,8 +11,17 @@ COPY=$OBJ/ls.copy | |||
11 | start_sshd | 11 | start_sshd |
12 | 12 | ||
13 | trace "start master, fork to background" | 13 | trace "start master, fork to background" |
14 | ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 120 | 14 | ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost \ |
15 | sleep 120 | ||
15 | 16 | ||
17 | verbose "test $tid: envpass" | ||
18 | trace "env passing over multiplexed connection" | ||
19 | _XXX_TEST=blah ${SSH} -S$CTL otherhost '[ "x$_XXX_TEST" = "xblah" ]' | ||
20 | if [ $? -ne 0 ]; then | ||
21 | fail "environment not found" | ||
22 | fi | ||
23 | |||
24 | verbose "test $tid: transfer" | ||
16 | rm -f ${COPY} | 25 | rm -f ${COPY} |
17 | trace "ssh transfer over multiplexed connection and check result" | 26 | trace "ssh transfer over multiplexed connection and check result" |
18 | ${SSH} -S$CTL otherhost cat ${DATA} > ${COPY} | 27 | ${SSH} -S$CTL otherhost cat ${DATA} > ${COPY} |