Fix testsuite to run with newer M4.

* tests/tools.at (autoconf --trace: user macros): Remove test
for tracing multiline macros, since m4 1.4.7a uses a different
way to number lines.

(cherry picked from commit 29e73bdce0a07327cca4bff3b0cff70dfec4ca24)

diff --git a/ChangeLog b/ChangeLog
index 090045dab295e816eb61d747bc0949fd47d3c8ec..f8a8f214d518b6f59dffac2744d004cf8e4b3e95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * tests/tools.at (autoconf --trace: user macros): Remove test
+       for tracing multiline macros, since m4 1.4.7a uses a different
+       way to number lines.  Problem reported by Ralf Wildenhues.
+
 2006-09-11  Stepan Kasal  <kasal@ucw.cz>
 
        * tests/local.at (AT_CHECK_M4): Fix this so that the testsuite

diff --git a/tests/tools.at b/tests/tools.at
index 3f6dc742881c4534af2cd33c2fdf99a8ad581174..9559ac2f30350b5688fe398b2e8994a8ec2fa2a4 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -169,11 +169,12 @@ TRACE1(foo, TRACE1(bar, baz))
 TRACE1(foo, active, baz)
 TRACE1(foo, [active], TRACE1(active, [active]))
 
-# With arguments, multiple lines.
-TRACE1(foo
-bar,
-bar
-foo)
+# Disable this since m4-1.4.7a behaves differently from m4-1.4.7 and earlier.
+## With arguments, multiple lines.
+#TRACE1(foo
+#bar,
+#bar
+#foo)
 ]])
 
 # Several --traces.
@@ -193,8 +194,6 @@ configure.ac:13:TRACE1:ACTIVE:active
 configure.ac:13:TRACE2:active
 configure.ac:13:TRACE1:foo:active::ACTIVE
 configure.ac:13:TRACE2:active::ACTIVE
-configure.ac:19:TRACE1:foo bar:bar foo
-configure.ac:19:TRACE2:bar foo
 ]])
 
 # Several line requests.
@@ -214,10 +213,6 @@ AT_CHECK_AUTOCONF([[-t TRACE1:'
 [ACTIVE], [active], [].
 
 [foo], [active], [].
-
-[foo
-bar], [bar
-foo], [].
 ]])
 
 # ${sep}@.
@@ -230,8 +225,6 @@ AT_CHECK_AUTOCONF([-t TRACE2:'${)===(}@'], 0,
 [ACTIVE])===([baz]
 [active]
 [active])===([])===([ACTIVE]
-[bar
-foo]
 ]])
 
 AT_CLEANUP