diff options
| author | Mike FABIAN <mfabian@redhat.com> | 2017-08-12 17:15:25 +0200 |
|---|---|---|
| committer | Mike FABIAN <mfabian@redhat.com> | 2017-08-12 17:20:24 +0200 |
| commit | a6bd872286b981b08577218c00e1ea693bad6095 (patch) | |
| tree | 0300489261a3d652f5011af864515ba30a4ebd18 | |
| parent | d68b451903acfa1f8c64bb168b2cbe78beeacb3d (diff) | |
| download | glibc-a6bd872286b981b08577218c00e1ea693bad6095.tar.gz glibc-a6bd872286b981b08577218c00e1ea693bad6095.tar.xz glibc-a6bd872286b981b08577218c00e1ea693bad6095.zip | |
Adapt test case data to the changes in the thousands separators
[BZ #20756] * localedata/tst-langinfo.sh: Adapt test case data. * stdlib/tst-strfmon_l.c: Likewise. * stdlib/tst-strtod4.c: Likewise. * stdlib/tst-strtod5i.c: Likewise.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rwxr-xr-x | localedata/tst-langinfo.sh | 2 | ||||
| -rw-r--r-- | stdlib/tst-strfmon_l.c | 8 | ||||
| -rw-r--r-- | stdlib/tst-strtod4.c | 6 | ||||
| -rw-r--r-- | stdlib/tst-strtod5i.c | 6 |
5 files changed, 22 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 000dc6d47b..4b6439680c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2017-08-12 Mike FABIAN <mfabian@redhat.com> + + Adapt test case data to the changes in the thousands + separators. + + [BZ #20756] + * localedata/tst-langinfo.sh: Adapt test case data. + * stdlib/tst-strfmon_l.c: Likewise. + * stdlib/tst-strtod4.c: Likewise. + * stdlib/tst-strtod5i.c: Likewise. + 2017-08-11 Florian Weimer <fweimer@redhat.com> [BZ #21242] diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh index 2f8854c422..972a9498fd 100755 --- a/localedata/tst-langinfo.sh +++ b/localedata/tst-langinfo.sh @@ -289,7 +289,7 @@ fr_FR.ISO-8859-1 D_T_FMT "%a %d %b %Y %T %Z" fr_FR.ISO-8859-1 D_FMT "%d/%m/%Y" fr_FR.ISO-8859-1 T_FMT "%T" fr_FR.ISO-8859-1 RADIXCHAR , -fr_FR.ISO-8859-1 THOUSEP " " +fr_FR.ISO-8859-1 THOUSEP " " fr_FR.ISO-8859-1 YESEXPR ^[+1oOyY] fr_FR.ISO-8859-1 NOEXPR ^[-0nN] ja_JP.EUC-JP ABDAY_1 Æü diff --git a/stdlib/tst-strfmon_l.c b/stdlib/tst-strfmon_l.c index ed7d486960..dff186f97a 100644 --- a/stdlib/tst-strfmon_l.c +++ b/stdlib/tst-strfmon_l.c @@ -150,11 +150,11 @@ static const struct locale_pair tests[] = "tg_TJ.UTF-8", { { - "1 234 567.89 TJS", "1 234 567.89 \u0440\u0443\u0431", + "1\u202f234\u202f567.89 TJS", "1\u202f234\u202f567.89 \u0440\u0443\u0431", "1234567.89 TJS", "1234567.89 \u0440\u0443\u0431" }, { - "-1 234 567.89 TJS", "-1 234 567.89 \u0440\u0443\u0431", + "-1\u202f234\u202f567.89 TJS", "-1\u202f234\u202f567.89 \u0440\u0443\u0431", "-1234567.89 TJS", "-1234567.89 \u0440\u0443\u0431" } } @@ -163,11 +163,11 @@ static const struct locale_pair tests[] = "hr_HR.UTF-8", { { - "HRK 1 234 567,89", "Kn 1 234 567,89", + "HRK 1\u202f234\u202f567,89", "Kn 1\u202f234\u202f567,89", "HRK 1234567,89", "Kn 1234567,89" }, { - "-HRK 1 234 567,89", "-Kn 1 234 567,89", + "-HRK 1\u202f234\u202f567,89", "-Kn 1\u202f234\u202f567,89", "-HRK 1234567,89", "-Kn 1234567,89" } } diff --git a/stdlib/tst-strtod4.c b/stdlib/tst-strtod4.c index 2d9d54c944..aae9835d82 100644 --- a/stdlib/tst-strtod4.c +++ b/stdlib/tst-strtod4.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <string.h> -#define NBSP "\xc2\xa0" +#define NNBSP "\xe2\x80\xaf" static const struct { @@ -12,8 +12,8 @@ static const struct double expected; } tests[] = { - { "000"NBSP"000"NBSP"000", "", 0.0 }, - { "1"NBSP"000"NBSP"000,5x", "x", 1000000.5 } + { "000"NNBSP"000"NNBSP"000", "", 0.0 }, + { "1"NNBSP"000"NNBSP"000,5x", "x", 1000000.5 } }; #define NTESTS (sizeof (tests) / sizeof (tests[0])) diff --git a/stdlib/tst-strtod5i.c b/stdlib/tst-strtod5i.c index 7e319585bb..d7135daaf6 100644 --- a/stdlib/tst-strtod5i.c +++ b/stdlib/tst-strtod5i.c @@ -22,7 +22,7 @@ #include <string.h> #include <math.h> -#define NBSP "\xc2\xa0" +#define NNBSP "\xe2\x80\xaf" static const struct { @@ -57,8 +57,8 @@ static const struct { "-0e-10", 1, -0.0 }, { "0e-1000000", 1, 0.0 }, { "-0e-1000000", 1, -0.0 }, - { "000"NBSP"000"NBSP"000", 1, 0.0 }, - { "-000"NBSP"000"NBSP"000", 1, -0.0 } + { "000"NNBSP"000"NNBSP"000", 1, 0.0 }, + { "-000"NNBSP"000"NNBSP"000", 1, -0.0 } }; #define NTESTS (sizeof (tests) / sizeof (tests[0])) |