summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <demaille@gostai.com>2009-08-12 16:18:12 +0200
committerAkim Demaille <demaille@gostai.com>2009-08-12 16:30:52 +0200
commit28169bab1f6f2fc9d682118703f6267c63583720 (patch)
tree0dde8b87f58cc1587b2889edfd4458a4eecf6d76
parent9f14e187368df7680c4c5313bd25e7f04de07ef0 (diff)
downloadbison-28169bab1f6f2fc9d682118703f6267c63583720.tar.gz
tests: GCC 4.5 compliance.
* tests/synclines.at (AT_SYNCLINES_COMPILE): Adjust to GCC 4.5's messages about #error.
-rw-r--r--ChangeLog6
-rw-r--r--tests/synclines.at13
2 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f3e157f..052ac7c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-08-12 Akim Demaille <demaille@gostai.com>
+ tests: GCC 4.5 compliance.
+ * tests/synclines.at (AT_SYNCLINES_COMPILE): Adjust to GCC 4.5's
+ messages about #error.
+
+2009-08-12 Akim Demaille <demaille@gostai.com>
+
build: fix the generation of the documentation.
Some of our targets use "bison --help", but they can't depend on
"bison" itself (to avoid additional requirements on the user), so
diff --git a/tests/synclines.at b/tests/synclines.at
index 8653b460..56efdac6 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -34,7 +34,18 @@ m4_define([AT_SYNCLINES_COMPILE],
# =>
# input.y:4: #error "4"
#
-AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' stderr]], 0, [stdout])
+# It may also issue more context information:
+#
+# input.y: In function 'yyparse':
+# input.y:8: #error "8"
+# =>
+# input.y:4: #error "8"
+#
+AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' \
+ -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' \
+ -e "/^[^:]*: In function '[^\']*':$/d" \
+ stderr]],
+ 0, [stdout])
])
# AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG)