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 <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 43a2f561372e91b09e06603b6f47fd726c36ed1a..ac19a64bf59bc8f0b8a38d64b21b19eee05e299c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-30  Eric Blake  <ebb9@byu.net>
 
+       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 dffeebf45ae77a8841c541ba597d46fb2ed58410..fd451d1fcbe86091ddc0746eac3520721e2546f8 100644 (file)
--- 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