Fix nscd/cachedumper.c compile errors

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

diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index 469d227afb2e6dcdf44c7ecdfd64066d4778213b..2b364a335f32079c20348bfb293c39c12c4fba1a 100755 (executable)
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -1,31 +1,31 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the implementation of strfmon(3).
-# Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
-#
+
 # 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.
 
-DEBUG=0
-case $1 in
--d) DEBUG=1; shift ;;
-esac
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <https://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
-datafile=$2
+run_program_prefix_before_env=$2
+run_program_env=$3
+run_program_prefix_after_env=$4
+test_program_prefix=$5
+datafile=$6
 
 here=`pwd`
 
@@ -33,40 +33,42 @@ 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
-    I18NPATH=. GCONV_PATH=${common_objpfx}iconvdata \
-    LOCPATH=${common_objpfx}localedata LC_ALL=C LANGUAGE=C \
-    ${common_objpfx}elf/ld.so --library-path $common_objpfx \
-    ${common_objpfx}locale/localedef \
-    --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns
+    # 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 || ret=$?
+    if [ $ret -ne 1 ]; then
+       echo "FAIL: Locale compilation for $cn failed (error $ret)."
+       exit 1
+    fi
 done
 
 # Run the tests.
-IFS="  "                # This is a TAB
-while read locale format value expect; do
+errcode=0
+# There's a TAB for IFS
+while IFS="    " read locale format value expect; do
+    case "$locale" in '#'*) continue ;; esac
     if [ -n "$format" ]; then
-       LOCPATH=${common_objpfx}localedata \
-       GCONV_PATH=${common_objpfx}/iconvdata \
-       ${common_objpfx}elf/ld.so --library-path $common_objpfx \
-        ${common_objpfx}localedata/tst-fmon \
-           "$locale" "$format" "$value" "$expect"
-       if [ $? -eq 0 ]; then
-           if [ $DEBUG -eq 1 ]; then
-               echo "Locale: \"${locale}\" Format: \"${format}\"" \
-                    "Value: \"${value}\" Expect: \"${expect}\"  passed"
-           fi
-       else
-           echo "Locale: \"${locale}\" Format: \"${format}\"" \
-                "Value: \"${value}\" Expect: \"${expect}\"    failed"
-           if [ $DEBUG -eq 0 ]; then
-               exit 1
-           fi
+       ret=0
+       expect=`echo "$expect" | sed 's/^\"\(.*\)\"$/\1/'`
+       ${test_program_prefix} ${common_objpfx}localedata/tst-fmon \
+       "$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
 
-exit $?
+exit $errcode
 # Local Variables:
 #  mode:shell-script
 # End: