Prefer https to http for gnu.org and fsf.org URLs

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

diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index 52d32d0a9b995c26c0c8ddb5ee84a04df08efed0..b032da9443d355f65f9566b29ce747d2e96d535d 100755 (executable)
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the implementation of strfmon(3).
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
 
@@ -16,13 +16,16 @@
 
 # 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/>.
+# <https://www.gnu.org/licenses/>.
 
 set -e
 
 common_objpfx=$1
-run_program_prefix=$2
-datafile=$3
+run_program_prefix_before_env=$2
+run_program_env=$3
+run_program_prefix_after_env=$4
+test_program_prefix=$5
+datafile=$6
 
 here=`pwd`
 
@@ -30,12 +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
-    I18NPATH=. GCONV_PATH=${common_objpfx}iconvdata \
-    LOCPATH=${common_objpfx}localedata LC_ALL=C LANGUAGE=C \
-    ${run_program_prefix} ${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.
@@ -44,12 +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/'`
-       LOCPATH=${common_objpfx}localedata \
-       GCONV_PATH=${common_objpfx}/iconvdata \
-       ${run_program_prefix} ${common_objpfx}localedata/tst-fmon \
-       "$locale" "$format" "$value" "$expect" < /dev/null ||
-       errcode=$?
+       ${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