From 3d4f9e324590737af07de73ce4d4eefea85fb16e Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 16 Sep 2010 22:02:50 +0200 Subject: [PATCH] tests: avoid localization failure due to unstable compiler messages. * tests/testsuite.at (LT_AT_NORMALIZE_COMPILER_OUTPUT): Attempt to normalize temporary file names in error messages. Fixes 'localized compiler messages' test failure on Darwin when creating fat (multi-ABI) libraries. Signed-off-by: Ralf Wildenhues --- ChangeLog | 8 ++++++++ tests/testsuite.at | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1697a1b6d..37f6c8462 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-09-16 Ralf Wildenhues + + tests: avoid localization failure due to unstable compiler messages. + * tests/testsuite.at (LT_AT_NORMALIZE_COMPILER_OUTPUT): + Attempt to normalize temporary file names in error messages. + Fixes 'localized compiler messages' test failure on Darwin when + creating fat (multi-ABI) libraries. + 2010-09-13 Peter Rosin Prefer $NM @file when the toolchain isn't native to $build. diff --git a/tests/testsuite.at b/tests/testsuite.at index ea13ec951..c450e100b 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -240,10 +240,13 @@ esac]) # - distcc process numbers, # - ccache file location, # - newline encoding, -# - location of the libtool script. +# - location of the libtool script, +# - error messages involving unstable temporary file names. m4_define([LT_AT_NORMALIZE_COMPILER_OUTPUT], [_ltbase=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'` -[sed "/^distcc\[[0-9]*\]/d; /^$_ltbase: compile/d" < $1 > $1.t] +[sed "/^distcc\[[0-9]*\]/d + /^$_ltbase: compile/d + s/\(tmp\/\{1,\}cc\)\([a-zA-Z0-9_]\{1,\}\)/\1-normalized-tmpname/g" < $1 > $1.t] LT_AT_UNIFY_NL([$1.t], [m4_default([$2], [$1])])[]dnl ]) -- 2.47.2