* tests/m4sh.at (LINENO): Protect from autom4te's substitution by

hand.
* tests/tools.at: Don't protect dnl, AT_DATA_M4SH does.

diff --git a/ChangeLog b/ChangeLog
index 165a71f08874ff1928c547cb4ac4cce3ccad02c3..31ced6f22117195ead3b285fa1746622ffbe0b7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-13  Akim Demaille  <akim@epita.fr>
+
+       * tests/m4sh.at (LINENO): Protect from autom4te's substitution by
+       hand.
+       * tests/tools.at: Don't protect dnl, AT_DATA_M4SH does.
+
 2001-11-13  Akim Demaille  <akim@epita.fr>
 
        * lib/autotest/general.m4 (AT_INIT): After having run the test

diff --git a/tests/m4sh.at b/tests/m4sh.at
index 04a5298684a3c7c5d365b85bbc1761e6c9fdc550..a8177e0d381d7ed720d20ec5fd54c3a20c7cbec1 100644 (file)
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -42,15 +42,15 @@ AT_SETUP([LINENO])
 # UNSET-LINENO is a shell condition to make sure the scripts have the
 # same number of lines in the output, so that their outputs be identical.
 m4_define([AT_DATA_LINENO],
-[AT_DATA_M4SH([$1],
-[[AS_INIT
+[AT_DATA([$1],
+[[AS@&t@_INIT
 if $2; then
-  AS_UNSET([LINENO])
+  AS@&t@_UNSET([LINENO])
 fi
-AS_SHELL_SANITIZE
+AS@&t@_SHELL_SANITIZE
 echo "Line: $3"
 grep 'Line: .*$4' $[0] >/dev/null ||
-  AS_ERROR([cannot find original script])
+  AS@&t@_ERROR([cannot find original script])
 exit 0
 ]])
 ])# AT_DATA_LINENO

diff --git a/tests/tools.at b/tests/tools.at
index fa57e32eafd0cba7e454cedc13a73da2d0377bfa..780b73eb8ed1745d926023f9180821eb5ddba4cc 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -255,7 +255,7 @@ AT_DATA_M4SH([experr],
 configure.ac:3: error: possibly undefined macro: _m4_bar
 configure.ac:4: error: possibly undefined macro: AS_FOO
 configure.ac:5: error: possibly undefined macro: _AS_BAR
-configure.ac:6: error: possibly undefined macro: d@&t@nl
+configure.ac:6: error: possibly undefined macro: dnl
 ]])
 
 AT_CHECK_AUTOCONF([], 1, [], experr)