summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <demaille@gostai.com>2009-08-19 14:39:27 +0200
committerAkim Demaille <demaille@gostai.com>2009-08-19 14:41:00 +0200
commit9142239a59453e38da3a7e7d98b8e345874d9862 (patch)
tree38aa4166dd4f0a5a45d3c88362d223b9108a77cb
parent171ad99d6421935a278656be6dc7161591835d00 (diff)
downloadbison-9142239a59453e38da3a7e7d98b8e345874d9862.tar.gz
tests: distcc compliance.
* tests/synclines.at (AT_SYNCLINES_COMPILE): Discard distcc's error messages from the output.
-rw-r--r--ChangeLog6
-rw-r--r--tests/synclines.at10
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 903d2678..e3defd81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-08-19 Akim Demaille <demaille@gostai.com>
+ tests: distcc compliance.
+ * tests/synclines.at (AT_SYNCLINES_COMPILE): Discard distcc's
+ error messages from the output.
+
+2009-08-19 Akim Demaille <demaille@gostai.com>
+
variables: simplify the upgrade of namespace into api.namespace.
This patch simplifies "variables: rename namespace as
diff --git a/tests/synclines.at b/tests/synclines.at
index 56efdac6..1f1f9bad 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -41,7 +41,15 @@ m4_define([AT_SYNCLINES_COMPILE],
# =>
# input.y:4: #error "8"
#
-AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' \
+#
+# And possibly distcc adds its bits.
+#
+# distcc[33187] ERROR: compile (null) on localhost failed
+# syncline.c:1:2: error: #error "1"
+# distcc[33185] ERROR: compile syncline.c on localhost failed
+
+AT_CHECK([[sed -e '/^distcc\[[0-9]*\] ERROR: .*/d' \
+ -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' \
-e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' \
-e "/^[^:]*: In function '[^\']*':$/d" \
stderr]],