From: Eric Blake Date: Mon, 30 Mar 2009 19:28:02 +0000 (-0600) Subject: Fix testsuite failures under zsh. X-Git-Tag: v2.63b~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7399cdcce9ef10d80bd010376c706358adf6fe5;p=thirdparty%2Fautoconf.git Fix testsuite failures under zsh. * tests/local.at (AT_CHECK_ENV): Exempt $argv and $ARGC, which are set by zsh -c 'emulate sh'. Reported by Ralf Wildenhues. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 43a2f5613..ac19a64bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-03-30 Eric Blake + Fix testsuite failures under zsh. + * tests/local.at (AT_CHECK_ENV): Exempt $argv and $ARGC, which are + set by zsh -c 'emulate sh'. + Reported by Ralf Wildenhues. + For now, skip parallel tests under less-tested shells. * tests/autotest.at (AT_CHECK_AT): Add pre-test argument. (Tested programs, Startup error messages, AT_CHECK_AT_TITLE) diff --git a/tests/local.at b/tests/local.at index dffeebf45..fd451d1fc 100644 --- a/tests/local.at +++ b/tests/local.at @@ -295,7 +295,7 @@ m4_define([AT_CHECK_CONFIGURE], # Set by AC_OUTPUT. # - AC_SUBST'ed variables # (FIXME: Generate a list of these automatically.) -# - _|@|.[*#?$].|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS +# - _|@|.[*#?$].|argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS # Some variables some shells use and change. # `.[*#?$].' catches `$#' etc. which are displayed like this: # | '!'=18186 @@ -330,7 +330,8 @@ if test -f state-env.before && test -f state-env.after; then [ALLOCA|GETLOADAVG_LIBS|KMEM_GROUP|NEED_SETGID|POW_LIB], [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC], [GREP|[EF]GREP|SED], - [[_@]|.[*#?$].|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ + [[_@]|.[*#?$].], + [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ $act_file 2>/dev/null | # There may be variables spread on several lines; remove latter lines. $GREP '^m4_defn([m4_re_word])=' >clean-$act_file