Move portable specific settings down.

This brings the top hunk of the file back in sync with OpenBSD
so patches to the CVS Id should apply instead of always being
rejected.

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 24a2bef6652acb2e1198cfa351259540b8fb4d47..73512a6121ff2def2e9885be47c1e0bbb81415d7 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -3,30 +3,6 @@
 
 #SUDO=sudo
 
-# Unbreak GNU head(1)
-_POSIX2_VERSION=199209
-export _POSIX2_VERSION
-
-case `uname -s 2>/dev/null` in
-OSF1*)
-       BIN_SH=xpg4
-       export BIN_SH
-       ;;
-CYGWIN*)
-       os=cygwin
-       ;;
-esac
-
-# 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.
-if test "x${EGREP}" != "x"; then
-       egrep ()
-{
-        ${EGREP} "$@"
-}
-fi
-
 if [ ! -x "$TEST_SSH_ELAPSED_TIMES" ]; then
        STARTTIME=`date '+%s'`
 fi
@@ -63,6 +39,8 @@ else
 fi
 unset SSH_AUTH_SOCK
 
+# Portable-specific settings.
+
 if [ -x /usr/ucb/whoami ]; then
        USER=`/usr/ucb/whoami`
 elif whoami >/dev/null 2>&1; then
@@ -77,6 +55,30 @@ if test -z "$LOGNAME"; then
        export LOGNAME
 fi
 
+# Unbreak GNU head(1)
+_POSIX2_VERSION=199209
+export _POSIX2_VERSION
+
+case `uname -s 2>/dev/null` in
+OSF1*)
+       BIN_SH=xpg4
+       export BIN_SH
+       ;;
+CYGWIN*)
+       os=cygwin
+       ;;
+esac
+
+# 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.
+if test "x${EGREP}" != "x"; then
+       egrep ()
+{
+        ${EGREP} "$@"
+}
+fi
+
 SRC=`dirname ${SCRIPT}`
 
 # defaults