From: Eric Blake <ebb9@byu.net>
Date: Thu, 26 Oct 2006 14:41:44 +0000 (+0000)
Subject: Fix testsuite to run with newer M4.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d651cc9985762e77244ef1575477d5c3889e5e31;p=thirdparty%2Fautoconf.git

Fix testsuite to run with newer M4.

* tests/m4sugar.at (m4_warn, m4_require: circular dependencies):
Also work with M4 1.4.8.

(cherry picked from commit e7c6c448e40c26d1d695760fec1538315d9b5406)
---

diff --git a/ChangeLog b/ChangeLog
index f8a8f214..40e9fd52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-26  Eric Blake  <ebb9@byu.net>
+
+	* tests/m4sugar.at (m4_warn, m4_require: circular dependencies):
+	Also work with M4 1.4.8.
+
 2006-10-24  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* tests/tools.at (autoconf --trace: user macros): Remove test
diff --git a/tests/m4sugar.at b/tests/m4sugar.at
index 6ca118c0..b40ab966 100644
--- a/tests/m4sugar.at
+++ b/tests/m4sugar.at
@@ -2,7 +2,7 @@
 
 AT_BANNER([M4sugar.])
 
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2008 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,8 +43,7 @@ AT_SETUP([[m4@&t@_warn]])
 
 AT_DATA_M4SUGAR([script.4s],
 [[m4_init
-m4_defun([cross_warning],
-[m4_warn([cross],  [cross])])
+m4_defun([cross_warning], [m4_warn([cross],  [cross])])
 
 m4_divert_push([0])m4_wrap([m4_divert_pop([0])[]])dnl
 m4_warn([obsolete],  [obsolete])dnl
@@ -53,27 +52,27 @@ m4_warn([syntax], [syntax])dnl
 ]])
 
 AT_CHECK_M4SUGAR([-o-], 0, [],
-[script.4s:8: warning: syntax
+[script.4s:7: warning: syntax
 ])
 
 AT_CHECK_M4SUGAR([-o- -Wall -f], 0, [],
-[script.4s:6: warning: obsolete
-script.4s:7: warning: cross
-script.4s:3: cross_warning is expanded from...
-script.4s:7: the top level
-script.4s:8: warning: syntax
+[script.4s:5: warning: obsolete
+script.4s:6: warning: cross
+script.4s:2: cross_warning is expanded from...
+script.4s:6: the top level
+script.4s:7: warning: syntax
 ])
 
 AT_CHECK_M4SUGAR([-o- -Wnone,cross -f], 0, [],
-[script.4s:7: warning: cross
-script.4s:3: cross_warning is expanded from...
-script.4s:7: the top level
+[script.4s:6: warning: cross
+script.4s:2: cross_warning is expanded from...
+script.4s:6: the top level
 ])
 
 AT_CHECK_M4SUGAR([-o- -Wnone,cross,error -f], 1, [],
-[[script.4s:7: warning: cross
-script.4s:3: cross_warning is expanded from...
-script.4s:7: the top level
+[[script.4s:6: warning: cross
+script.4s:2: cross_warning is expanded from...
+script.4s:6: the top level
 ]])
 
 AT_CLEANUP
@@ -90,14 +89,11 @@ AT_SETUP([[m4@&t@_require: circular dependencies]])
 # m4-listification.
 
 AT_DATA_M4SUGAR([script.4s],
-[[m4_defun([foo],
-[m4_require([bar])])
+[[m4_defun([foo], [m4_require([bar])])
 
-m4_defun([bar],
-[m4_require([foo])])
+m4_defun([bar], [m4_require([foo])])
 
-m4_defun([baz],
-[m4_require([foo])])
+m4_defun([baz], [m4_require([foo])])
 
 m4_init
 m4_divert_push([0])m4_wrap([m4_divert_pop([0])[]])dnl
@@ -105,14 +101,14 @@ baz
 ]])
 
 AT_CHECK_M4SUGAR([], 1, [],
-[[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:12: bar is required by...
-script.4s:2: foo is expanded from...
-script.4s:12: foo is required by...
-script.4s:8: baz is expanded from...
-script.4s:12: the top level
+[[script.4s:9: error: m4@&t@_require: circular dependency of foo
+script.4s:9: foo is required by...
+script.4s:3: bar is expanded from...
+script.4s:9: bar is required by...
+script.4s:1: foo is expanded from...
+script.4s:9: foo is required by...
+script.4s:5: baz is expanded from...
+script.4s:9: the top level
 autom4te: m4 failed with exit status: 1
 ]])
 AT_CLEANUP