mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
f16491eb8e
The error and warning handling in localedef, locale, and iconv
is a bit of a mess.
We use ugly constructs like this:
WITH_CUR_LOCALE (error (1, errno, gettext ("\
cannot read character map directory `%s'"), directory));
to issue errors, and read error_message_count directly from the
error API to detect errors. The problem with that is that the
code also uses error to print warnings, and informative messages.
All of this leads to problems where just having warnings will
produce an exit status as-if errors had been seen.
To fix this situation I have adopted the following high-level
changes:
* All errors are counted distinctly.
* All warnings are counted distinctly.
* All informative messages are not counted.
* Increasing verbosity cannot generate *more* errors, and
it previously did for errors conditional on verbose,
this is now fixed.
* Increasing verbosity *can* generate *more* warnings.
* Making the output quiet cannot generate *fewer* errors,
and it previously did for errors conditional on be_quiet,
this is now fixed.
* Each of error, warning, and informative message has it's
own function to call defined in record-status.h, and they
are: record_error, record_warning, and record_verbose.
* The record_error function always records an error, but
conditional on be_quiet may not print it.
* The record_warning function always records a warning,
but conditional on be_quiet may not print it.
* The record_verbose function only prints the verbose
message if verbose is true and be_quiet is false.
This has allowed the following fix:
* Previously any warnings were being treated as errors
because they incremented error_message_count, but now
we properly return an exit status of 1 if there are
warnings but output was generated.
All of this allows localedef to correctly decide if errors,
or warnings were present, and produce the correct exit code.
The locale and iconv programs now also use record-status.h
and we have removed the WITH_CUR_LOCALE hack, and instead
have internal push_locale/pop_locale functions centralized
in the record routines.
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
77 lines
2.4 KiB
Bash
Executable File
77 lines
2.4 KiB
Bash
Executable File
#!/bin/sh
|
|
# Testing the implementation of localedata.
|
|
# Copyright (C) 1998-2017 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
# Contributed by Andreas Jaeger, <aj@arthur.rhein-neckar.de>, 1998.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
set -e
|
|
|
|
common_objpfx=$1; shift
|
|
localedef_before_env=$1; shift
|
|
run_program_env=$1; shift
|
|
localedef_after_env=$1; shift
|
|
|
|
test_locale ()
|
|
{
|
|
charmap=$1
|
|
input=$2
|
|
out=$3
|
|
rep=$4
|
|
if test $rep; then
|
|
rep="--repertoire-map $rep"
|
|
fi
|
|
# We expect the test locales to fail with warnings, they are mostly
|
|
# incomplete and used for testing purposes, but that is OK.
|
|
ret=0
|
|
${localedef_before_env} \
|
|
${run_program_env} \
|
|
I18NPATH=. \
|
|
${localedef_after_env} --quiet -c -f $charmap -i $input \
|
|
${rep} ${common_objpfx}localedata/$out || ret=$?
|
|
# Any error greater than one means we ran into an implementation
|
|
# defined limit or saw an error that caused the output not to
|
|
# be written, or lastly saw a fatal error that terminated
|
|
# localedef.
|
|
if [ $ret -gt 1 ]; then
|
|
echo "Charmap: \"${charmap}\" Inputfile: \"${input}\"" \
|
|
"Outputdir: \"${out}\" failed"
|
|
exit 1
|
|
else
|
|
echo -n "locale $out generated succesfully"
|
|
if [ $ret -eq 1 ]; then
|
|
echo " (with warnings)"
|
|
else
|
|
echo " (without warnings)"
|
|
fi
|
|
fi
|
|
}
|
|
|
|
test_locale IBM437 de_DE de_DE.437
|
|
test_locale tests/test1.cm tests/test1.def test1
|
|
test_locale tests/test2.cm tests/test2.def test2
|
|
test_locale tests/test3.cm tests/test3.def test3
|
|
test_locale tests/test4.cm tests/test4.def test4
|
|
test_locale tests/test5.cm tests/test5.def test5 tests/test5.ds
|
|
test_locale tests/test6.cm tests/test6.def test6 tests/test6.ds
|
|
test_locale tests/test7.cm tests/test7.def test7
|
|
|
|
exit 0
|
|
|
|
# Local Variables:
|
|
# mode:shell-script
|
|
# End:
|