[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CVS testsuite failure if m4 is called gm4...
From: |
Akim Demaille |
Subject: |
Re: CVS testsuite failure if m4 is called gm4... |
Date: |
28 Oct 2002 08:15:29 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Honest Recruiter) |
>>>>> "ezra" == ezra peisach <address@hidden> writes:
ezra> 3. tools.at:118: FAILED near `tools.at:134'
>>>>> "Paul" == Paul Jarc <address@hidden> writes:
Paul> testsuite.log is attached. $ m4 --version GNU m4 1.4
Thanks, I'm installing this patch.
Index: ChangeLog
from Akim Demaille <address@hidden>
* tests/atspecific.m4 (AT_CHECK_AUTOM4TE): Be robust to different
m4 executable names, and different GNU M4 version.
Reported by Ezra Peisach and Paul Jarc.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/Makefile.in,v
retrieving revision 1.184
diff -u -u -r1.184 Makefile.in
--- Makefile.in 27 Oct 2002 18:14:58 -0000 1.184
+++ Makefile.in 28 Oct 2002 07:14:31 -0000
@@ -53,6 +53,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
M4 = @M4@
Index: THANKS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/THANKS,v
retrieving revision 1.99
diff -u -u -r1.99 THANKS
--- THANKS 22 Oct 2002 08:20:19 -0000 1.99
+++ THANKS 28 Oct 2002 07:14:32 -0000
@@ -141,6 +141,7 @@
Paul Berrevoets address@hidden
Paul Eggert address@hidden
Paul Gampe address@hidden
+Paul Jarc address@hidden
Paul Martinolich address@hidden
Pavel Roskin address@hidden
Peter Eisentraut address@hidden
Index: bin/Makefile.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/Makefile.in,v
retrieving revision 1.26
diff -u -u -r1.26 Makefile.in
--- bin/Makefile.in 27 Oct 2002 18:16:06 -0000 1.26
+++ bin/Makefile.in 28 Oct 2002 07:14:32 -0000
@@ -53,6 +53,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
M4 = @M4@
Index: tests/atspecific.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/atspecific.m4,v
retrieving revision 1.73
diff -u -u -r1.73 atspecific.m4
--- tests/atspecific.m4 18 Oct 2002 15:20:46 -0000 1.73
+++ tests/atspecific.m4 28 Oct 2002 07:14:32 -0000
@@ -25,20 +25,37 @@
# AT_CHECK_AUTOM4TE(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)
# -----------------------------------------------------------
-# If stderr is specified, normalize the observed stderr. E.g.:
+# If stderr is specified, normalize the observed stderr. E.g. (GNU M4 1.5):
#
# /usr/local/bin/m4: script.4s: 1: Cannot open foo: No such file or directory
# autom4te: /usr/local/bin/m4 failed with exit status: 1
#
+# or (using gm4 as GNU M4 1.4):
+#
+# script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory
+# autom4te: /usr/local/bin/m4 failed with exit status: 1
+#
# becomes
#
# m4: script.4s: 1: Cannot open foo: No such file or directory
# autom4te: m4 failed with exit status: 1
-
+#
+# We use the following sed patterns:
+#
+# (file): (line): (m4):
+# or (m4): (file): (line):
+# to m4: (file): (line):
+#
+# and
+# autom4te: [^ ]m4
+# to autom4te: m4
m4_define([AT_CHECK_AUTOM4TE],
[AT_CHECK([autom4te $1], [$2], [$3], m4_ifval([$4], [stderr]))
m4_ifval([$4],
-[AT_CHECK([[sed 's,[^ ]*/m4,m4,' stderr]], [0],[$4])])
+[AT_CHECK([[sed -e 's,^\([^:]*\): *\([0-9][0-9]*\): *[^:]*m4: ,m4: \1: \2: ,' \
+ -e 's,^[^:]*m4: *\([^:]*\): *\([0-9][0-9]*\): ,m4: \1: \2: ,' \
+ -e 's/^autom4te: [^ ]*m4 /autom4te: m4 /' \
+ stderr]], [0],[$4])])
])