diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-06-23 09:28:20 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-23 09:28:20 +1000 |
commit | 3b9c0adaab5736a1b9f5d69a3bf471ff46b8b88f (patch) | |
tree | abd105236803d78ec564e7f38be9ec74d7848027 /regress | |
parent | 6223eea5962535f2efe9789a9bc19ecca1539713 (diff) |
- dtucker@cvs.openbsd.org 2004/06/22 22:55:56
[regress/dynamic-forward.sh regress/test-exec.sh]
Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@
Diffstat (limited to 'regress')
-rw-r--r-- | regress/dynamic-forward.sh | 4 | ||||
-rw-r--r-- | regress/test-exec.sh | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index 3a6e5c1ef..392fc1978 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh | |||
@@ -3,8 +3,8 @@ | |||
3 | 3 | ||
4 | tid="dynamic forwarding" | 4 | tid="dynamic forwarding" |
5 | 5 | ||
6 | PORT=4242 | 6 | FWDPORT=`expr $PORT + 1` |
7 | FWDPORT=4243 | 7 | |
8 | DATA=/bin/ls${EXEEXT} | 8 | DATA=/bin/ls${EXEEXT} |
9 | 9 | ||
10 | if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then | 10 | if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then |
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index a184c16d1..b0ac64e9e 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,9 +1,14 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | PORT=4242 | ||
5 | #SUDO=sudo | 4 | #SUDO=sudo |
6 | 5 | ||
6 | if [ ! -z "$TEST_SSH_PORT" ]; then | ||
7 | PORT="$TEST_SSH_PORT" | ||
8 | else | ||
9 | PORT=4242 | ||
10 | fi | ||
11 | |||
7 | if [ -x /usr/ucb/whoami ]; then | 12 | if [ -x /usr/ucb/whoami ]; then |
8 | USER=`/usr/ucb/whoami` | 13 | USER=`/usr/ucb/whoami` |
9 | elif whoami >/dev/null 2>&1; then | 14 | elif whoami >/dev/null 2>&1; then |