diff options
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/gen-locale.sh | 26 | ||||
| -rwxr-xr-x | localedata/tst-fmon.sh | 19 | ||||
| -rwxr-xr-x | localedata/tst-locale.sh | 19 |
3 files changed, 51 insertions, 13 deletions
diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh index 0ebde468f0..b4ec68c36e 100644 --- a/localedata/gen-locale.sh +++ b/localedata/gen-locale.sh @@ -30,10 +30,16 @@ generate_locale () charmap=$1 input=$2 out=$3 - if ${localedef_before_env} ${run_program_env} I18NPATH=../localedata \ - ${localedef_after_env} --quiet -c -f $charmap -i $input \ - ${common_objpfx}localedata/$out - then + ret=0 + ${localedef_before_env} ${run_program_env} I18NPATH=../localedata \ + ${localedef_after_env} --quiet -c -f $charmap -i $input \ + ${common_objpfx}localedata/$out || ret=$? + # All locales compile fine, except those with SHIFT_JIS charmap + # and those fail with exit code 1 because SHIFT_JIS issues a + # warning (it is not ASCII compatible). + if [ $ret -eq 0 ] \ + || ( [ $ret -eq 1 ] \ + && [ "$charmap" = "SHIFT_JIS" ] ); then # The makefile checks the timestamp of the LC_CTYPE file, # but localedef won't have touched it if it was able to # hard-link it to an existing file. @@ -50,5 +56,13 @@ locale=`echo $locfile|sed 's|\([^.]*\)[.].*/LC_CTYPE|\1|'` charmap=`echo $locfile|sed 's|[^.]*[.]\(.*\)/LC_CTYPE|\1|'` echo "Generating locale $locale.$charmap: this might take a while..." -generate_locale `echo $charmap | sed -e s/SJIS/SHIFT_JIS/` $locale \ - $locale.$charmap + +# For SJIS the charmap is SHIFT_JIS. We just want the locale to have +# a slightly nicer name instead of using "*.SHIFT_SJIS", but that +# means we need a mapping here. +charmap_real="$charmap" +if [ "$charmap" = "SJIS" ]; then + charmap_real="SHIFT_JIS" +fi + +generate_locale $charmap_real $locale $locale.$charmap diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index f471ff03e4..029485d109 100755 --- a/localedata/tst-fmon.sh +++ b/localedata/tst-fmon.sh @@ -33,13 +33,22 @@ lang=`sed -e '/^#/d' -e '/^$/d' -e '/^C /d' -e '/^tstfmon/d' -e 's/^\([^ ]*\).*/ # Generate data files. for cns in `cd ./tst-fmon-locales && ls tstfmon_*`; do + ret=0 cn=tst-fmon-locales/$cns fn=charmaps/ISO-8859-1 + # All of the test locales run with "USC " as their int_curr_symbol, + # and the use of this generates a warning because it does not meet + # the POSIX requirement that the name be an ISO 4217 compliant + # country code e.g. USD. Therefore we *expect* an exit code of 1. ${run_program_prefix_before_env} \ ${run_program_env} \ I18NPATH=. \ ${run_program_prefix_after_env} ${common_objpfx}locale/localedef \ - --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns + --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns || ret=$? + if [ $ret -ne 1 ]; then + echo "FAIL: Locale compilation for $cn failed (error $ret)." + exit 1 + fi done # Run the tests. @@ -48,10 +57,14 @@ errcode=0 while IFS=" " read locale format value expect; do case "$locale" in '#'*) continue ;; esac if [ -n "$format" ]; then + ret=0 expect=`echo "$expect" | sed 's/^\"\(.*\)\"$/\1/'` ${test_program_prefix} ${common_objpfx}localedata/tst-fmon \ - "$locale" "$format" "$value" "$expect" < /dev/null || - errcode=$? + "$locale" "$format" "$value" "$expect" < /dev/null || ret=$? + if [ $ret -ne 0 ]; then + echo "FAIL: Locale $locale failed the test (error $ret)." + errcode=1 + fi fi done < $datafile diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh index c73c1087d3..2d7da3c4a1 100755 --- a/localedata/tst-locale.sh +++ b/localedata/tst-locale.sh @@ -34,18 +34,29 @@ test_locale () 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 - - if [ $? -ne 0 ]; then + ${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 "locale $out generated succesfully" + echo -n "locale $out generated succesfully" + if [ $ret -eq 1 ]; then + echo " (with warnings)" + else + echo " (without warnings)" + fi fi } |