I installed this in master. I have not bothered backporting these
changes (i.e., neither the previous ones (GCC 4.5 compliance) nor
these ones on top) to the other branches.
* tests/synclines.at (AT_SYNCLINES_COMPILE): Discard distcc's
error messages from the output.
From 9142239a59453e38da3a7e7d98b8e345874d9862 Mon Sep 17 00:00:00 2001
From: Akim Demaille <[email protected]>
Date: Wed, 19 Aug 2009 14:39:27 +0200
Subject: [PATCH] tests: distcc compliance.
* tests/synclines.at (AT_SYNCLINES_COMPILE): Discard distcc's
error messages from the output.
---
ChangeLog | 6 ++++++
tests/synclines.at | 10 +++++++++-
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 903d267..e3defd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-08-19 Akim Demaille <[email protected]>
+ tests: distcc compliance.
+ * tests/synclines.at (AT_SYNCLINES_COMPILE): Discard distcc's
+ error messages from the output.
+
+2009-08-19 Akim Demaille <[email protected]>
+
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 56efdac..1f1f9ba 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]],
--
1.6.4
