diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2021-08-08 17:39:56 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-08-08 17:39:56 +1000 |
| commit | f2ccf6c9f395923695f22345e626dfd691227aaf (patch) | |
| tree | 68bccfe5adbd56558a421d0066c3695c1d8296a0 | |
| parent | 71b0eb997e220b0fc9331635af409ad84979f2af (diff) | |
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.
| -rw-r--r-- | regress/test-exec.sh | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 24a2bef6..73512a61 100644 --- 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 |