iconv, localedef: avoid floating point rounding differences [BZ #24372]

[thirdparty/glibc.git] / localedata / tst-locale.sh

diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index 6851c364c8e945b062ea3d32d7fbc61bea355221..978f09e57d0518fd5899bab415f3f04d0183cc88 100755 (executable)
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -1,25 +1,29 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the implementation of localedata.
-# Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1998-2019 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 Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
+# 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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 ()
 {
@@ -27,24 +31,43 @@ test_locale ()
     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=. \
-    ${common_objpfx}elf/ld.so --library-path $common_objpfx \
-    ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \
-      --repertoire-map $rep ${common_objpfx}localedata/$out
-
-    if [ $? -ne 0 ]; then
+    ${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 mnemonic.ds
-test_locale tests/test1.cm tests/test1.def test1 mnemonic.ds
-test_locale tests/test2.cm tests/test2.def test2 mnemonic.ds
-test_locale tests/test3.cm tests/test3.def test3 mnemonic.ds
-test_locale tests/test4.cm tests/test4.def test4 mnemonic.ds
+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