RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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.
This commit is contained in:
Tim Rice 2013-06-02 14:05:48 -07:00
parent 898ac935e5
commit 5ab9b63468
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -12,6 +12,10 @@
to prevent noise from configure. Patch from Nathan Osman. (bz#2114). to prevent noise from configure. Patch from Nathan Osman. (bz#2114).
- (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android. - (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android.
Patch from Nathan Osman. 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 20130601
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to

10
configure.ac
View File

@ -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 # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 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_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -812,6 +812,7 @@ mips-sony-bsd|mips-sony-newsos4)
SP_MSG="yes" ], ) SP_MSG="yes" ], )
], ],
) )
TEST_SHELL=$SHELL # let configure find us a capable shell
;; ;;
*-*-sunos4*) *-*-sunos4*)
CPPFLAGS="$CPPFLAGS -DSUNOS4" CPPFLAGS="$CPPFLAGS -DSUNOS4"
@ -855,6 +856,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE([BROKEN_SETREGID]) AC_DEFINE([BROKEN_SETREGID])
AC_DEFINE([PASSWD_NEEDS_USERNAME], [1], [must supply username to passwd]) AC_DEFINE([PASSWD_NEEDS_USERNAME], [1], [must supply username to passwd])
AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"]) AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"])
TEST_SHELL=$SHELL # let configure find us a capable shell
;; ;;
# UnixWare 7.x, OpenUNIX 8 # UnixWare 7.x, OpenUNIX 8
*-*-sysv5*) *-*-sysv5*)
@ -866,10 +868,10 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE([BROKEN_SETREUID]) AC_DEFINE([BROKEN_SETREUID])
AC_DEFINE([BROKEN_SETREGID]) AC_DEFINE([BROKEN_SETREGID])
AC_DEFINE([PASSWD_NEEDS_USERNAME]) AC_DEFINE([PASSWD_NEEDS_USERNAME])
TEST_SHELL=$SHELL # let configure find us a capable shell
case "$host" in case "$host" in
*-*-sysv5SCO_SV*) # SCO OpenServer 6.x *-*-sysv5SCO_SV*) # SCO OpenServer 6.x
maildir=/var/spool/mail maildir=/var/spool/mail
TEST_SHELL=/u95/bin/sh
AC_DEFINE([BROKEN_LIBIAF], [1], AC_DEFINE([BROKEN_LIBIAF], [1],
[ia_uinfo routines not supported by OS yet]) [ia_uinfo routines not supported by OS yet])
AC_DEFINE([BROKEN_UPDWTMPX]) AC_DEFINE([BROKEN_UPDWTMPX])
@ -910,7 +912,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE([PASSWD_NEEDS_USERNAME]) AC_DEFINE([PASSWD_NEEDS_USERNAME])
AC_CHECK_FUNCS([getluid setluid]) AC_CHECK_FUNCS([getluid setluid])
MANTYPE=man MANTYPE=man
TEST_SHELL=ksh TEST_SHELL=$SHELL # let configure find us a capable shell
SKIP_DISABLE_LASTLOG_DEFINE=yes SKIP_DISABLE_LASTLOG_DEFINE=yes
;; ;;
*-*-unicosmk*) *-*-unicosmk*)

4
regress/Makefile
View File

@ -155,14 +155,14 @@ t-exec: ${LTESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \ @if [ "x$?" = "x" ]; then exit 0; fi; \
for TEST in ""$?; do \ for TEST in ""$?; do \
echo "run test $${TEST}" ... 1>&2; \ 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 done
t-exec-interop: ${INTEROP_TESTS:=.sh} t-exec-interop: ${INTEROP_TESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \ @if [ "x$?" = "x" ]; then exit 0; fi; \
for TEST in ""$?; do \ for TEST in ""$?; do \
echo "run test $${TEST}" ... 1>&2; \ 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 done
# Not run by default # Not run by default