From: Joel E. Denny <jdenny@clemson.edu>
Date: Wed, 31 Mar 2010 16:46:53 +0000 (-0400)
Subject: portability: fix test suite for GCC 4.5's new #error message.
X-Git-Tag: v2.5_rc1~100
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=132247cd94d409f04997dc0b550f4ee6abbb735a;p=platform%2Fupstream%2Fbison.git

portability: fix test suite for GCC 4.5's new #error message.

Reported by Tys Lefering at
<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00030.html>.
* NEWS (2.4.3): Mention.
* tests/synclines.at (AT_TEST_SYNCLINE): Implement.
(cherry picked from commit 18493762be5ddaaa64c9e498dad11afd6b0e82f6)
---

diff --git a/ChangeLog b/ChangeLog
index 6cd11f5..d764f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-31  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+	portability: fix test suite for GCC 4.5's new #error message.
+	Reported by Tys Lefering at
+	<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00030.html>.
+	* NEWS (2.4.3): Mention.
+	* tests/synclines.at (AT_TEST_SYNCLINE): Implement.
+
 2010-03-30  Akim Demaille  <demaille@gostai.com>
 
 	fix comments.
diff --git a/NEWS b/NEWS
index b2a9444..69b87e2 100644
--- a/NEWS
+++ b/NEWS
@@ -191,6 +191,8 @@ Bison News
 ** Problems with spawning M4 on at least FreeBSD 8 and FreeBSD 9 have
    been fixed.
 
+** Failures in the test suite for GCC 4.5 have been fixed.
+
 * Changes in version 2.4.2 (2010-03-20):
 
 ** Some portability problems that resulted in failures and livelocks
diff --git a/tests/synclines.at b/tests/synclines.at
index 08b33c5..a975433 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -71,7 +71,9 @@ AT_CHECK([[test "`cat stdout`" = 'syncline.c:1: @%:@error "1"' || exit 77]])
 AT_DATA([[input.y]], [$2])
 AT_BISON_CHECK([-o input.c input.y])
 AT_SYNCLINES_COMPILE([input.c])
-AT_CHECK([cat stdout], 0, [$3])
+# GCC 4.5 tells you the function within which #error appears, but
+# previous versions of gcc do not.
+AT_CHECK([grep -v ': In function ' stdout], 0, [$3])
 AT_CLEANUP
 ])