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 <Ralf.Wildenhues@gmx.de>
This commit is contained in:
Ralf Wildenhues 2010-09-16 22:02:50 +02:00
parent 72064249b2
commit 3d4f9e3245
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2010-09-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
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 <peda@lysator.liu.se> 2010-09-13 Peter Rosin <peda@lysator.liu.se>
Prefer $NM @file when the toolchain isn't native to $build. Prefer $NM @file when the toolchain isn't native to $build.

View File

@ -240,10 +240,13 @@ esac])
# - distcc process numbers, # - distcc process numbers,
# - ccache file location, # - ccache file location,
# - newline encoding, # - 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], m4_define([LT_AT_NORMALIZE_COMPILER_OUTPUT],
[_ltbase=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'` [_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 LT_AT_UNIFY_NL([$1.t], [m4_default([$2], [$1])])[]dnl
]) ])