diff options
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 13 | ||||
| -rw-r--r-- | localedata/sort-test.sh | 1 | ||||
| -rw-r--r-- | localedata/tst-fmon.c | 4 | ||||
| -rwxr-xr-x | localedata/tst-fmon.sh | 3 | ||||
| -rw-r--r-- | localedata/tst-numeric.c | 2 | ||||
| -rw-r--r-- | localedata/tst-numeric.sh | 3 |
6 files changed, 21 insertions, 5 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 8322e01524..c5306f8c6d 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,16 @@ +2003-04-30 Petter Reinholdtsen <pere@hungry.com> + + * tst-fmon.c: Report name of locale if setlocale() fails. + * tst-numeric.c: Likewise. + + * tst-fmon.sh: Ignore lines starting with hash '#' in the data file. + * tst-numeric.sh: Likewise. + +2003-04-30 Petter Reinholdtsen <pere@hungry.com> + + * sort-test.sh: Output 'diff -u' when sorting test failed, to make + it easier to find out what was wrong with the sorting order. + 2003-04-16 Petter Reinholdtsen <pere@hungry.com> * Makefile (tests): Add LC_NUMERIC test tst-numeric.out. diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh index d47f20911f..a1ec24060a 100644 --- a/localedata/sort-test.sh +++ b/localedata/sort-test.sh @@ -27,6 +27,7 @@ for l in $lang; do echo "$l OK" else echo "$l FAIL" + diff -u $cns.in ${common_objpfx}localedata/$cns.xout status=1 fi done diff --git a/localedata/tst-fmon.c b/localedata/tst-fmon.c index 4710efbd2b..af87335972 100644 --- a/localedata/tst-fmon.c +++ b/localedata/tst-fmon.c @@ -1,5 +1,5 @@ /* Testing the implementation of strfmon(3). - Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997. @@ -46,7 +46,7 @@ main (int argc, char *argv[]) if (setlocale (LC_MONETARY, argv[1]) == NULL) { - perror ("setlocale"); + fprintf (stderr, "setlocale(LC_MONETARY, \"%s\"): %m\n", argv[1]); exit (EXIT_SETLOCALE); } /* This is locale-dependent! see setlocale(3) for details */ diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index 7b3cb2b02d..e58db1d344 100755 --- a/localedata/tst-fmon.sh +++ b/localedata/tst-fmon.sh @@ -1,6 +1,6 @@ #! /bin/sh # Testing the implementation of strfmon(3). -# Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997. # @@ -41,6 +41,7 @@ done # Run the tests. # 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 \ diff --git a/localedata/tst-numeric.c b/localedata/tst-numeric.c index 86e6533f01..9d3c91d155 100644 --- a/localedata/tst-numeric.c +++ b/localedata/tst-numeric.c @@ -51,7 +51,7 @@ main (int argc, char *argv[]) if (setlocale (LC_ALL, argv[1]) == NULL) { - perror ("setlocale"); + fprintf (stderr, "setlocale(LC_ALL, \"%s\"): %m\n", argv[1]); exit (EXIT_SETLOCALE); } diff --git a/localedata/tst-numeric.sh b/localedata/tst-numeric.sh index e6e973feba..f590dfd042 100644 --- a/localedata/tst-numeric.sh +++ b/localedata/tst-numeric.sh @@ -1,6 +1,6 @@ #! /bin/sh # Testing the implementation of LC_NUMERIC and snprintf(3). -# Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997. # @@ -27,6 +27,7 @@ datafile=$3 # Run the tests. # 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 \ |