* tests/m4sh.at (LINENO): Skip the test if LINENO cannot be unset.

Fixes false failures on Darwin.

diff --git a/ChangeLog b/ChangeLog
index a517e8159285f035e74adf01279f8eb016ffe321..75a4500a0fd56f73af3399f915e0e409d6d2b22d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-22  Akim Demaille  <akim@epita.fr>
+
+       * tests/m4sh.at (LINENO): Skip the test if LINENO cannot be unset.
+       Fixes false failures on Darwin.
+
 2002-04-21  Paul Eggert  <eggert@twinsun.com>
 
        * TODO, bin/autoupdate.in, doc/autoconf.texi,
@@ -11,7 +16,7 @@
        ZSH_VERSION fixes.  Bug reported by Raja R Harinath.
        * lib/autotest/general.m4 (AT_INIT): Likewise.
        * tests/atgeneral.m4 (AT_INIT): Likewise.
-       
+
 2002-04-19  Paul Eggert  <eggert@twinsun.com>
 
        * NEWS, TODO, bin/autom4te.in, bin/autoreconf.in, bin/autoupdate.in,

diff --git a/tests/m4sh.at b/tests/m4sh.at
index af36e925f171586f187baad9616ff187f49fad49..a10904e0c15aa740f7bb8e3b3c8d68ca3d9671ac 100644 (file)
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -45,6 +45,11 @@ m4_define([AT_DATA_LINENO],
 [AT_DATA([$1],
 [[AS@&t@_INIT
 if $2; then
+  # We cannot unset LINENO with Zsh, yet this test case relies on
+  # unsetting LINENO to compare its result when (i) LINENO is supported
+  # and when (ii) it is not.
+  # So just skip is the shell is ZSH.
+  test -n "${ZSH_VERSION+set}" && AS@&t@_ERROR([cannot unset LINENO], 77)
   AS@&t@_UNSET([LINENO])
 fi
 _AS@&t@_PREPARE
@@ -84,8 +89,8 @@ AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-2)],
                                                   0, [expout])
 AT_CHECK([sh ./test/test-2],                       0, [expout])
 
-# Beware that *.lineno scripts can be *here* while the masters are in test/.
-AT_CLEANUP(reference test test-1.lineno test-2.lineno)
+AT_CLEANUP
+
 
 
 ## ------------ ##
@@ -232,7 +237,7 @@ AS_EXIT(0)
 AT_CHECK_M4SH
 AT_CHECK([./script])
 
-AT_CLEANUP(1 a)
+AT_CLEANUP