From: TAMUKI Shoichi <tamuki@linet.gr.jp>
To: libc-alpha@sourceware.org
Subject: [PATCH v5 4/5] strftime: Add tst-strfitme2 [BZ #23758]
Date: Sun, 06 Jan 2019 06:36:00 -0000 [thread overview]
Message-ID: <201901060635.AA04160@tamuki.linet.gr.jp> (raw)
In-Reply-To: <201901060628.AA04156@tamuki.linet.gr.jp>
Add a test to verify the behavior of strftime on alternative
representation for year.
Currently in glibc, besides ja_JP (Japan) locale, the locales using
the conversion specifier "%Ey" are lo_LA (Laos) and th_TH (Thailand).
In these locales, they use the Buddhist era. The Buddhist era is a
value obtained by adding 543 to the Christian era, so they are not
affected by the change of the conversion specifier "%Ey".
ChangeLog:
[BZ #23758]
* time/Makefile: Add tst-strftime2 to tests. Also add ja_JP.UTF-8,
lo_LA.UTF-8, and th_TH.UTF-8 to LOCALES.
* time/tst-strftime2.c: New file.
---
time/Makefile | 5 +-
time/tst-strftime2.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 136 insertions(+), 2 deletions(-)
create mode 100644 time/tst-strftime2.c
diff --git a/time/Makefile b/time/Makefile
index d23ba2dee6e..5c6304ece1d 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -43,13 +43,14 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
- tst-tzname tst-y2039 bug-mktime4
+ tst-tzname tst-y2039 bug-mktime4 tst-strftime2
include ../Rules
ifeq ($(run-built-tests),yes)
LOCALES := de_DE.ISO-8859-1 en_US.ISO-8859-1 ja_JP.EUC-JP fr_FR.UTF-8 \
- es_ES.UTF-8 pl_PL.UTF-8 ru_RU.UTF-8
+ es_ES.UTF-8 pl_PL.UTF-8 ru_RU.UTF-8 \
+ ja_JP.UTF-8 lo_LA.UTF-8 th_TH.UTF-8
include ../gen-locales.mk
$(objpfx)tst-ftime_l.out: $(gen-locales)
diff --git a/time/tst-strftime2.c b/time/tst-strftime2.c
new file mode 100644
index 00000000000..756c841ba9c
--- /dev/null
+++ b/time/tst-strftime2.c
@@ -0,0 +1,133 @@
+/* Verify the behavior of strftime on alternate representation for year.
+
+ Copyright (C) 2019 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ 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
+ Lesser General Public License for more details.
+
+ 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/>. */
+
+#include <locale.h>
+#include <time.h>
+#include <stdio.h>
+#include <string.h>
+
+static const char *locales[] = { "ja_JP.UTF-8", "lo_LA.UTF-8", "th_TH.UTF-8" };
+#define nlocales (sizeof (locales) / sizeof (locales[0]))
+
+static const char *formats[] = { "%EY", "%_EY", "%-EY" };
+#define nformats (sizeof (formats) / sizeof (formats[0]))
+
+static const struct
+{
+ const int d, m, y;
+} dates[] =
+ {
+ { 1, 3, 88 },
+ { 7, 0, 89 },
+ { 8, 0, 89 },
+ { 1, 3, 90 },
+ { 1, 3, 97 },
+ { 1, 3, 98 }
+ };
+#define ndates (sizeof (dates) / sizeof (dates[0]))
+
+static char ref[nlocales][nformats][ndates][100];
+
+static void
+mkreftable (void)
+{
+ int i, j, k;
+ char era[10];
+ static const int yrj[] = { 63, 64, 1, 2, 9, 10 };
+ static const int yrb[] = { 2531, 2532, 2532, 2533, 2540, 2541 };
+
+ for (i = 0; i < nlocales; i++)
+ for (j = 0; j < nformats; j++)
+ for (k = 0; k < ndates; k++)
+ {
+ if (i == 0)
+ {
+ sprintf (era, "%s", (k < 2) ? "\xe6\x98\xad\xe5\x92\x8c"
+ : "\xe5\xb9\xb3\xe6\x88\x90");
+ if (yrj[k] == 1)
+ sprintf (ref[i][j][k], "%s\xe5\x85\x83\xe5\xb9\xb4", era);
+ else
+ {
+ if (j == 0)
+ sprintf (ref[i][j][k], "%s%02d\xe5\xb9\xb4", era, yrj[k]);
+ else if (j == 1)
+ sprintf (ref[i][j][k], "%s%2d\xe5\xb9\xb4", era, yrj[k]);
+ else
+ sprintf (ref[i][j][k], "%s%d\xe5\xb9\xb4", era, yrj[k]);
+ }
+ }
+ else if (i == 1)
+ {
+ sprintf (era, "\xe0\xba\x9e\x2e\xe0\xba\xaa\x2e ");
+ sprintf (ref[i][j][k], "%s%d", era, yrb[k]);
+ }
+ else
+ {
+ sprintf (era, "\xe0\xb8\x9e\x2e\xe0\xb8\xa8\x2e ");
+ sprintf (ref[i][j][k], "%s%d", era, yrb[k]);
+ }
+ }
+}
+
+static int
+do_test (void)
+{
+ int i, j, k, result = 0;
+ struct tm ttm;
+ char date[11], buf[100];
+ size_t r, e;
+
+ mkreftable ();
+ for (i = 0; i < nlocales; i++)
+ {
+ if (setlocale (LC_ALL, locales[i]) == NULL)
+ {
+ printf ("locale %s does not exist, skipping...\n", locales[i]);
+ continue;
+ }
+ printf ("[%s]\n", locales[i]);
+ for (j = 0; j < nformats; j++)
+ {
+ for (k = 0; k < ndates; k++)
+ {
+ ttm.tm_mday = dates[k].d;
+ ttm.tm_mon = dates[k].m;
+ ttm.tm_year = dates[k].y;
+ strftime (date, sizeof (date), "%F", &ttm);
+ r = strftime (buf, sizeof (buf), formats[j], &ttm);
+ e = strlen (ref[i][j][k]);
+ printf ("%s\t\"%s\"\t\"%s\"", date, formats[j], buf);
+ if (strcmp (buf, ref[i][j][k]) != 0)
+ {
+ printf ("\tshould be \"%s\"", ref[i][j][k]);
+ if (r != e)
+ printf ("\tgot: %zu, expected: %zu", r, e);
+ result = 1;
+ }
+ else
+ printf ("\tOK");
+ putchar ('\n');
+ }
+ putchar ('\n');
+ }
+ }
+ return result;
+}
+
+#include <support/test-driver.c>
--
2.12.2
next prev parent reply other threads:[~2019-01-06 6:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-06 6:30 [PATCH v5 0/5] strftime: Improve the width of alternate representation for year " TAMUKI Shoichi
2019-01-06 6:36 ` [PATCH v5 1/5] strftime: Add missing uses of L_ macro, etc. " TAMUKI Shoichi
2019-01-09 10:08 ` Rafal Luzynski
2019-01-09 10:21 ` Siddhesh Poyarekar
2019-01-09 22:58 ` Rafal Luzynski
2019-01-11 4:54 ` TAMUKI Shoichi
2019-01-11 12:07 ` Rafal Luzynski
2019-01-11 14:21 ` Siddhesh Poyarekar
2019-01-10 0:46 ` TAMUKI Shoichi
2019-01-06 6:36 ` TAMUKI Shoichi [this message]
2019-01-06 6:36 ` [PATCH v5 3/5] strftime: Pass the additional flags from "%EY" to "%Ey" " TAMUKI Shoichi
2019-01-06 6:36 ` [PATCH v5 2/5] strftime: Set the default width of "%Ey" to 2 " TAMUKI Shoichi
2019-01-09 10:13 ` Rafal Luzynski
2019-01-09 10:25 ` Siddhesh Poyarekar
2019-01-09 23:02 ` Rafal Luzynski
2019-01-10 0:46 ` TAMUKI Shoichi
2019-01-06 6:54 ` [PATCH v5 5/5] strftime: Document the description for "%EC", "%Ey", and "%EY" " TAMUKI Shoichi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201901060635.AA04160@tamuki.linet.gr.jp \
--to=tamuki@linet.gr.jp \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).