From: Darren Tucker <dtucker@dtucker.net>
Date: Tue, 6 Apr 2021 23:59:15 +0000 (+1000)
Subject: Move the TEST_SSH_PORT section down a bit.
X-Git-Tag: V_8_6_P1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef4f46ab4387bb863b471bad124d46e8d911a79a;p=thirdparty%2Fopenssh-portable.git

Move the TEST_SSH_PORT section down a bit.

This groups the portable-specific changes together and makes it a
little more likely that patches will apply cleanly.
---

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 4d04e04b1..f6d7f38a4 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -17,12 +17,6 @@ CYGWIN*)
 	;;
 esac
 
-if [ ! -z "$TEST_SSH_PORT" ]; then
-	PORT="$TEST_SSH_PORT"
-else
-	PORT=4242
-fi
-
 # If configure tells us to use a different egrep, create a wrapper function
 # to call it.  This means we don't need to change all the tests that depend
 # on a good implementation.
@@ -47,6 +41,12 @@ if test -z "$LOGNAME"; then
 	export LOGNAME
 fi
 
+if [ ! -z "$TEST_SSH_PORT" ]; then
+	PORT="$TEST_SSH_PORT"
+else
+	PORT=4242
+fi
+
 OBJ=$1
 if [ "x$OBJ" = "x" ]; then
 	echo '$OBJ not defined'