[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: FYI, temporary "make check" build requirement
From: |
Eric Blake |
Subject: |
Re: FYI, temporary "make check" build requirement |
Date: |
Sat, 03 Nov 2007 08:45:50 -0600 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) Gecko/20070728 Thunderbird/2.0.0.6 Mnenhy/0.7.5.666 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Ralf Wildenhues on 11/2/2007 12:37 PM:
Hi Ralf,
> This is what I found with a casual check: 2.59 is not sufficient,
> but Automake 1.7.9 seems to be. I'll applied the patch below, if
> nobody disagrees.
>
>
> 2007-11-02 Ralf Wildenhues <address@hidden>
>
> * configure.ac (AC_PREREQ): Require version 2.60, for
> AC_PROG_SED, AC_PROG_GREP.
Thanks, please apply.
> FWIW, with m4 1.4.5, test 125 (Define a newline) fails due to the
> changed error line number reporting of m4:
> | -configure.ac:5: warning: AC_DEFINE: `one
> | -configure.ac:5: two' is not a valid preprocessor define value
> | +configure.ac:6: warning: AC_DEFINE: `one
> | +configure.ac:6: two' is not a valid preprocessor define value
Fixed as follows:
- --
Don't work too hard, make some time for fun as well!
Eric Blake address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHLImd84KuGfSFAYARAgLQAKDOKNXWMNZUIt6jXsmWhiUfJ8knYACggpDR
ZXKCmf63oCRLH9bTjA8dlcc=
=Uhur
-----END PGP SIGNATURE-----
>From e69d6f5323c8a4c4ab599afa49d619c9a3bf8f70 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Sat, 3 Nov 2007 08:44:44 -0600
Subject: [PATCH] Support m4 1.4.5 in testsuite.
* tests/torture.at (Define a newline): Exclude line numbers in
error message.
Reported by Ralf Wildenhues.
Signed-off-by: Eric Blake <address@hidden>
---
ChangeLog | 5 +++++
tests/torture.at | 30 ++++++++++++++++++------------
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8124d3d..7c7375d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-11-03 Eric Blake <address@hidden>
+ Support m4 1.4.5 in testsuite.
+ * tests/torture.at (Define a newline): Exclude line numbers in
+ error message.
+ Reported by Ralf Wildenhues.
+
Adjust version comparison to account for git snapshot numbers.
* lib/m4sugar/m4sugar.m4 (_m4_version_unletter): Also treat - as a
component separator.
diff --git a/tests/torture.at b/tests/torture.at
index d537eb9..354deee 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -766,13 +766,17 @@ AT_SETUP([Define a newline])
AT_CONFIGURE_AC([[AC_DEFINE([foo], [one
two], [This spans two lines.])
]])
-AT_CHECK_AUTOCONF([], [], [],
-[[configure.ac:5: warning: AC_DEFINE: `one
-configure.ac:5: two' is not a valid preprocessor define value
+AT_CHECK_AUTOCONF([], [], [], [stderr])
+dnl Older versions of m4 report error at line 6 (end of macro);
+dnl newer versions report it at line 5 (start of macro).
+AT_CHECK([[sed 's/^configure.ac:[56]: //' stderr]], [],
+[[warning: AC_DEFINE: `one
+two' is not a valid preprocessor define value
]])
-AT_CHECK_AUTOHEADER([], [], [],
-[[configure.ac:5: warning: AC_DEFINE: `one
-configure.ac:5: two' is not a valid preprocessor define value
+AT_CHECK_AUTOHEADER([], [], [], [stderr])
+AT_CHECK([[sed 's/^configure.ac:[56]: //' stderr]], [],
+[[warning: AC_DEFINE: `one
+two' is not a valid preprocessor define value
]])
AT_CHECK_CONFIGURE
AT_CHECK_DEFINES([[#define foo one
@@ -781,13 +785,15 @@ AT_CHECK_DEFINES([[#define foo one
AT_CONFIGURE_AC([[AC_DEFINE_UNQUOTED([foo], [one
two], [This spans two lines.])
]])
-AT_CHECK_AUTOCONF([], [], [],
-[[configure.ac:5: warning: AC_DEFINE_UNQUOTED: `one
-configure.ac:5: two' is not a valid preprocessor define value
+AT_CHECK_AUTOCONF([], [], [], [stderr])
+AT_CHECK([[sed 's/^configure.ac:[56]: //' stderr]], [],
+[[warning: AC_DEFINE_UNQUOTED: `one
+two' is not a valid preprocessor define value
]])
-AT_CHECK_AUTOHEADER([], [], [],
-[[configure.ac:5: warning: AC_DEFINE_UNQUOTED: `one
-configure.ac:5: two' is not a valid preprocessor define value
+AT_CHECK_AUTOHEADER([], [], [], [stderr])
+AT_CHECK([[sed 's/^configure.ac:[56]: //' stderr]], [],
+[[warning: AC_DEFINE_UNQUOTED: `one
+two' is not a valid preprocessor define value
]])
AT_CHECK_CONFIGURE
AT_CHECK_DEFINES([[#define foo one
--
1.5.3.2