- (tim) [configure.ac regress/Makefile] With rev 1.47 of test-exec.sh we

   need a shell that can handle "[ file1 -nt file2 ]". Rather than keep
   dealing with shell portability issues in regression tests, we let
   configure find us a capable shell on those platforms with an old /bin/sh.

3 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 329560a68..ccbb790b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
    to prevent noise from configure. Patch from Nathan Osman. (bz#2114).
  - (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android.
    Patch from Nathan Osman.
+ - (tim) [configure.ac regress/Makefile] With rev 1.47 of test-exec.sh we
+   need a shell that can handle "[ file1 -nt file2 ]". Rather than keep
+   dealing with shell portability issues in regression tests, we let
+   configure find us a capable shell on those platforms with an old /bin/sh.
 
 20130601
  - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/configure.ac b/configure.ac
index d6c57864c..b8a610d5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.530 2013/06/02 16:03:26 dtucker Exp $
+# $Id: configure.ac,v 1.531 2013/06/02 21:05:49 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.530 $)
+AC_REVISION($Revision: 1.531 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -812,6 +812,7 @@ mips-sony-bsd|mips-sony-newsos4)
                         SP_MSG="yes" ], )
                 ],
         )
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
         ;;
 *-*-sunos4*)
         CPPFLAGS="$CPPFLAGS -DSUNOS4"
@@ -855,6 +856,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE([BROKEN_SETREGID])
         AC_DEFINE([PASSWD_NEEDS_USERNAME], [1], [must supply username to passwd])
         AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"])
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
         ;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
@@ -866,10 +868,10 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE([BROKEN_SETREUID])
         AC_DEFINE([BROKEN_SETREGID])
         AC_DEFINE([PASSWD_NEEDS_USERNAME])
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
         case "$host" in
         *-*-sysv5SCO_SV*)       # SCO OpenServer 6.x
                 maildir=/var/spool/mail
-                TEST_SHELL=/u95/bin/sh
                 AC_DEFINE([BROKEN_LIBIAF], [1],
                         [ia_uinfo routines not supported by OS yet])
                 AC_DEFINE([BROKEN_UPDWTMPX])
@@ -910,7 +912,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE([PASSWD_NEEDS_USERNAME])
         AC_CHECK_FUNCS([getluid setluid])
         MANTYPE=man
-        TEST_SHELL=ksh
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
         SKIP_DISABLE_LASTLOG_DEFINE=yes
         ;;
 *-*-unicosmk*)
diff --git a/regress/Makefile b/regress/Makefile
index b19c7ae22..ab2a6ae7b 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -155,14 +155,14 @@ t-exec:	${LTESTS:=.sh}
         @if [ "x$?" = "x" ]; then exit 0; fi; \
         for TEST in ""$?; do \
                 echo "run test $${TEST}" ... 1>&2; \
-                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
         done
 
 t-exec-interop: ${INTEROP_TESTS:=.sh}
         @if [ "x$?" = "x" ]; then exit 0; fi; \
         for TEST in ""$?; do \
                 echo "run test $${TEST}" ... 1>&2; \
-                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
         done
 
 # Not run by default