Hi all,
From 02a3220b061f232d30baf1d1d3bc497d7e9417b8 Mon Sep 17 00:00:00 2001
From: Akim Demaille <demai...@gostai.com>
Date: Mon, 5 Jan 2009 15:10:55 +0100
Subject: [PATCH] Fix distcc/ccache interferences with the test suite.
* tests/localization.at (localized compiler messages): Ignore
distcc log messages.
---
tests/localization.at | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/tests/localization.at b/tests/localization.at
index d489fef..a338bda 100644
--- a/tests/localization.at
+++ b/tests/localization.at
@@ -1,6 +1,6 @@
# localization.at -- libtool and locales -*- Autotest -*-
#
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
# Written by Ralf Wildenhues, 2008
#
# This file is part of GNU Libtool.
@@ -47,6 +47,22 @@ mv -f stdout expected-stdout
mv -f stderr expected-stderr
AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c ||
exit 1],
[1], [stdout], [stderr])
+
+# Get rid of useless differences, such as distcc process numbers
+# and ccache file location.
+#
+# distcc[54517] ERROR: compile
/Users/akim/.ccache/a.tmp.montero.gostai.ensta.fr.54506.i on localhost failed
+# a.c:1: error: size of array 'x' is negative
+# distcc[54506] ERROR: compile a.c on localhost failed
+#
+# Just ignore the whole line which only wraps the genuine compiler
+# error message.
+for f in expected-stdout expected-stderr stdout stderr
+do
+ sed -e '/^distcc\[[0-9]*\]/d' $f >$f.tmp
+ mv -f $f.tmp $f
+done
+
AT_CHECK([diff expected-stderr stderr])
LTBASE=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'`
AT_CHECK([grep -v "^$LTBASE: compile" stdout | diff expected-stdout -])
--
1.6.0.4.790.gaa14a
