From 132247cd94d409f04997dc0b550f4ee6abbb735a Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Wed, 31 Mar 2010 12:46:53 -0400 Subject: [PATCH] portability: fix test suite for GCC 4.5's new #error message. Reported by Tys Lefering at . * NEWS (2.4.3): Mention. * tests/synclines.at (AT_TEST_SYNCLINE): Implement. (cherry picked from commit 18493762be5ddaaa64c9e498dad11afd6b0e82f6) --- ChangeLog | 8 ++++++++ NEWS | 2 ++ tests/synclines.at | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6cd11f54..d764f122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-03-31 Joel E. Denny + + portability: fix test suite for GCC 4.5's new #error message. + Reported by Tys Lefering at + . + * NEWS (2.4.3): Mention. + * tests/synclines.at (AT_TEST_SYNCLINE): Implement. + 2010-03-30 Akim Demaille fix comments. diff --git a/NEWS b/NEWS index b2a94440..69b87e2c 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 08b33c5f..a9754333 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 ]) -- 2.45.2