* tests/m4sugar.at (cross_warning): Make sure to enable the

output, so that we can track spurious m4sugar output.
* tests/local.at: Require 2.57.
(AT_CHECK_M4SUGAR, AT_CHECK_M4SH): Don't m4_default the arguments that
are defaulted by AT_CHECK anyway.
Use AT_CHECK_AUTOM4TE.
* lib/m4sugar/m4sugar.m4: There should be no output at all: add a
missing dnl.

diff --git a/ChangeLog b/ChangeLog
index 3d9ba44718638cf5978e8b7c36e904133d7fc7f4..a45dcb86b20171da8dfcd29529f1711428eb66d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-08-27  Akim Demaille  <akim@epita.fr>
+
+       * tests/m4sugar.at (cross_warning): Make sure to enable the
+       output, so that we can track spurious m4sugar output.
+       * tests/local.at: Require 2.57.
+       (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): Don't m4_default the arguments that
+       are defaulted by AT_CHECK anyway.
+       Use AT_CHECK_AUTOM4TE.
+       * lib/m4sugar/m4sugar.m4: There should be no output at all: add a
+       missing dnl.
+
 2003-08-27  Akim Demaille  <akim@epita.fr>
 
        * bin/autoheader.in: Issue the "Using auxiliary..." message only

diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index 42210125b7ed3b907c1a051b5a6d5bee4cb3c68a..02c417d5a1fb5c14ccbe8725ec83d4254a2984c6 100644 (file)
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -222,7 +222,7 @@ m4_define([m4_warn],
 [_m4_warn([$1], [$2],
 m4_ifdef([m4_expansion_stack],
          [m4_defn([m4_expansion_stack])
-m4_location[: the top level]]))
+m4_location[: the top level]]))dnl
 ])
 
 

diff --git a/tests/local.at b/tests/local.at
index d0bdba6ffa24c1b5fbf5649fd3a416fbccc965f9..1494391b7a2a3e55137ebc86053e3af4525e93fc 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -18,7 +18,7 @@
 # 02111-1307, USA.
 
 # We need a very up to date version of Autotest.
-m4_version_prereq([2.53])
+m4_version_prereq([2.57])
 
 # Used in many tests.
 m4_pattern_allow([^AS_EXIT$])
@@ -90,7 +90,7 @@ m4_define([AT_DATA_M4SUGAR],
 # ----------------------------------------------------------
 m4_define([AT_CHECK_M4SUGAR],
 [AT_CHECK_AUTOM4TE([--language=m4sugar script.4s -o script $1],
-         m4_default([$2], [0]), [$3], [$4])])
+                  [$2], [$3], [$4])])
 
 
 
@@ -113,8 +113,8 @@ m4_define([AT_DATA_M4SH],
 # AT_CHECK_M4SH(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)
 # -------------------------------------------------------
 m4_define([AT_CHECK_M4SH],
-[AT_CHECK([autom4te --language=m4sh script.as -o script $1],
-         m4_default([$2], [0]), [$3], [$4])])
+[AT_CHECK_AUTOM4TE([--language=m4sh script.as -o script $1],
+                  [$2], [$3], [$4])])
 
 
 
@@ -359,7 +359,7 @@ AT_CHECK_CONFIGURE
 AT_CHECK_ENV
 
 AT_CLEANUP()dnl
-])# AT_CHECK_UPDATE
+])# AT_CHECK_AU_MACRO
 
 
 
@@ -368,4 +368,3 @@ AT_CLEANUP()dnl
 ## ----------------------- ##
 
 AT_INIT
-

diff --git a/tests/m4sugar.at b/tests/m4sugar.at
index 716d8df86b3264575a38ca08e2b9870718f56cd9..6ca118c08060428555c58b7a881e24939d23650d 100644 (file)
--- a/tests/m4sugar.at
+++ b/tests/m4sugar.at
@@ -44,12 +44,12 @@ AT_SETUP([[m4@&t@_warn]])
 AT_DATA_M4SUGAR([script.4s],
 [[m4_init
 m4_defun([cross_warning],
-[m4_warn([cross],  [cross])
-])
+[m4_warn([cross],  [cross])])
 
-m4_warn([obsolete],  [obsolete])
-cross_warning
-m4_warn([syntax], [syntax])
+m4_divert_push([0])m4_wrap([m4_divert_pop([0])[]])dnl
+m4_warn([obsolete],  [obsolete])dnl
+cross_warning[]dnl
+m4_warn([syntax], [syntax])dnl
 ]])
 
 AT_CHECK_M4SUGAR([-o-], 0, [],
@@ -59,20 +59,20 @@ AT_CHECK_M4SUGAR([-o-], 0, [],
 AT_CHECK_M4SUGAR([-o- -Wall -f], 0, [],
 [script.4s:6: warning: obsolete
 script.4s:7: warning: cross
-script.4s:4: cross_warning is expanded from...
+script.4s:3: cross_warning is expanded from...
 script.4s:7: the top level
 script.4s:8: warning: syntax
 ])
 
 AT_CHECK_M4SUGAR([-o- -Wnone,cross -f], 0, [],
 [script.4s:7: warning: cross
-script.4s:4: cross_warning is expanded from...
+script.4s:3: cross_warning is expanded from...
 script.4s:7: the top level
 ])
 
 AT_CHECK_M4SUGAR([-o- -Wnone,cross,error -f], 1, [],
 [[script.4s:7: warning: cross
-script.4s:4: cross_warning is expanded from...
+script.4s:3: cross_warning is expanded from...
 script.4s:7: the top level
 ]])
 
@@ -100,18 +100,19 @@ m4_defun([baz],
 [m4_require([foo])])
 
 m4_init
+m4_divert_push([0])m4_wrap([m4_divert_pop([0])[]])dnl
 baz
 ]])
 
 AT_CHECK_M4SUGAR([], 1, [],
-[[script.4s:11: error: m4@&t@_require: circular dependency of foo
-script.4s:11: foo is required by...
+[[script.4s:12: error: m4@&t@_require: circular dependency of foo
+script.4s:12: foo is required by...
 script.4s:5: bar is expanded from...
-script.4s:11: bar is required by...
+script.4s:12: bar is required by...
 script.4s:2: foo is expanded from...
-script.4s:11: foo is required by...
+script.4s:12: foo is required by...
 script.4s:8: baz is expanded from...
-script.4s:11: the top level
+script.4s:12: the top level
 autom4te: m4 failed with exit status: 1
 ]])
 AT_CLEANUP