diff options
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 9 | ||||
| -rw-r--r-- | localedata/Makefile | 8 | ||||
| -rw-r--r-- | localedata/SUPPORTED | 1 | ||||
| -rw-r--r-- | localedata/tst-strptime.c | 54 |
4 files changed, 13 insertions, 59 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 6ef7dc78db..2fdd858446 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,12 @@ +2012-05-21 Bruno Haible <bruno@clisp.org> + Andreas Jaeger <aj@suse.de> + + * SUPPORTED: Remove vi_VN.TCVN/TCVN5712-1. + * tst-strptime.c: Remove, we do not support vi_VN.TCVN5712-1 + anymore. + * Makefile (LOCALES): Remove vi_VN.TCVN5712-1 from list. + (tests): Remove tst-strptime. + 2012-05-11 Andreas Schwab <schwab@linux-m68k.org> [BZ #11837] diff --git a/localedata/Makefile b/localedata/Makefile index 13189607c6..0873a5524f 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -78,7 +78,7 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \ tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \ tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \ - tst-strfmon1 tst-sscanf tst-strptime bug-setlocale1 tst-setlocale2 + tst-strfmon1 tst-sscanf bug-setlocale1 tst-setlocale2 ifeq (yes,$(build-shared)) ifneq (no,$(PERL)) tests: $(objpfx)mtrace-tst-leaks @@ -119,9 +119,9 @@ ifeq (no,$(cross-compiling)) LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \ en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \ hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \ - vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 \ - tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 \ - ja_JP.UTF-8 si_LK.UTF-8 tr_TR.ISO-8859-9 + nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \ + zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \ + tr_TR.ISO-8859-9 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') CHARMAPS := $(shell echo "$(LOCALES)" | \ sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g) diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 1fd78472c7..b33d5b8df8 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -409,7 +409,6 @@ ur_PK/UTF-8 \ uz_UZ/ISO-8859-1 \ uz_UZ@cyrillic/UTF-8 \ ve_ZA/UTF-8 \ -vi_VN.TCVN/TCVN5712-1 \ vi_VN/UTF-8 \ wa_BE/ISO-8859-1 \ wa_BE@euro/ISO-8859-15 \ diff --git a/localedata/tst-strptime.c b/localedata/tst-strptime.c deleted file mode 100644 index bc2c7f1b64..0000000000 --- a/localedata/tst-strptime.c +++ /dev/null @@ -1,54 +0,0 @@ -#include <locale.h> -#include <time.h> -#include <stdio.h> -#include <string.h> - -static int -do_test (void) -{ - int result = 0; - - if (setlocale (LC_ALL, "vi_VN.TCVN5712-1") == NULL) - { - puts ("cannot set locale"); - return 1; - } - struct tm tm; - memset (&tm, '\0', sizeof (tm)); - /* This is November in Vietnamese encoded using TCVN5712-1. */ - static const char s[] = "\ -\x54\x68\xb8\x6e\x67\x20\x6d\xad\xea\x69\x20\x6d\xe9\x74\0"; - char *r = strptime (s, "%b", &tm); - printf ("r = %p, r-s = %tu, tm.tm_mon = %d\n", r, r - s, tm.tm_mon); - result = r == NULL || r - s != 14 || tm.tm_mon != 10; - - if (setlocale (LC_ALL, "ja_JP.UTF-8") == NULL) - { - puts ("cannot set locale"); - return 1; - } - static const char s2[] = "\ -\x32\x35\x20\x30\x36\x20\xe5\xb9\xb3\xe6\x88\x90\x32\x30\0"; - memset (&tm, '\0', sizeof (tm)); - r = strptime (s2, "%d %m %EC%Ey", &tm); - printf ("\ -r = %p, r-s2 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n", - r, r - s2, tm.tm_mday, tm.tm_mon, tm.tm_year); - result |= (r == NULL || r - s2 != 14 || tm.tm_mday != 25 || tm.tm_mon != 5 - || tm.tm_year != 108); - - static const char s3[] = "\ -\x32\x35\x20\x30\x36\x20\xe5\xb9\xb3\xe6\x88\x90\x32\x30\xe5\xb9\xb4\0"; - memset (&tm, '\0', sizeof (tm)); - r = strptime (s3, "%d %m %EY", &tm); - printf ("\ -r = %p, r-s3 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n", - r, r - s3, tm.tm_mday, tm.tm_mon, tm.tm_year); - result |= (r == NULL || r - s3 != 17 || tm.tm_mday != 25 || tm.tm_mon != 5 - || tm.tm_year != 108); - - return result; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" |