[PATCH v2] update tzset tests
Jeff Johnston
jjohnstn@redhat.com
Fri May 27 15:46:30 GMT 2022
Thanks to both of you for the patch and testing.
I had to do some manual cut/paste as the patch wouldn't apply but I have
merged the test patch plus my changes for tzset.
If I have messed anything up, please reply to the list.
Regards,
-- Jeff J.
On Sun, May 22, 2022 at 5:02 PM Dimitar Dimitrov <dimitar@dinux.eu> wrote:
> On Sun, May 22, 2022 at 11:51:45AM +0200, jdoubleu wrote:
> > Dimitar Dimitrov <dimitar@dinux.eu> writes:
> > > Only the following test case fails in tzset.c:
> >
> > jdoubleu <hi@jdoubleu.de> writes:
> > > I'm going fix my patch. Thanks for running the tests!
> >
> > I've fixed that one test case. I wasn't able to run it myself, yet.
> Hi,
>
> The entire tzset test case passes for pru-unknown-elf:
> PASS: newlib.time/tzset.c execution
>
> Thanks,
> Dimitar
>
> >
> > > BTW, it took me a while to realize that your patch and the source code
> in
> > > newlib's GIT have different line endings
> >
> > The patch is now formated with CLRF line endings. I checked tzset_r.c
> and it
> > also uses CLRF. But maybe I checked it out the wrong way?
> I see only LF symbols in your patch, not CRLF. Perhaps it's something with
> my
> email client.
> >
> >
> > Cheers
> > ---
> > 🙎🏻♂️ jdoubleu
>
> > From 90f857d6a4ec999074f892fb0641a2d785c09de5 Mon Sep 17 00:00:00 2001
> > From: jdoubleu <hi@jdoubleu.de>
> > Date: Sat, 14 May 2022 15:41:22 +0200
> > Subject: [PATCH] update tzset tests
> >
> > Add test cases for parser errors after reworked parsing behavior.
> > ---
> > newlib/testsuite/newlib.time/tzset.c | 58 +++++++++++++++++++++-------
> > 1 file changed, 45 insertions(+), 13 deletions(-)
> >
> > diff --git a/newlib/testsuite/newlib.time/tzset.c
> b/newlib/testsuite/newlib.time/tzset.c
> > index 0e5b196c6..19a33be73 100644
> > --- a/newlib/testsuite/newlib.time/tzset.c
> > +++ b/newlib/testsuite/newlib.time/tzset.c
> > @@ -93,7 +93,6 @@ struct tz_test test_timezones[] = {
> > {"<WINT+03>3:15<SUM+02>2:30:15", IN_SECONDS(3, 15, 0),
> IN_SECONDS(2, 30, 15)},
> > {"<H3M15>3:15<H2M30S15>2:30:15", IN_SECONDS(3, 15, 0),
> IN_SECONDS(2, 30, 15)}, // requires TZNAME_MAX >= 8 + 1
> > {"<+H6M20S12>6:20:12<-H4M40S14>-4:40:14", IN_SECONDS(6, 20,
> 12), -IN_SECONDS(4, 40, 14)}, // requires TZNAME_MAX >= 9 + 1
> > - {"<+0123456789ABCDEF>3:33:33", IN_SECONDS(3, 33,
> 33), NO_TIME}, // truncates the name (17 + 1)
> >
> > /*
> > * real-world test vectors.
> > @@ -111,13 +110,44 @@ struct tz_test test_timezones[] = {
> > { /* Asia/Colombo */ "<+0530>-5:30",
> -IN_SECONDS(5, 30, 0), NO_TIME},
> > { /* Europe/Berlin */ "CET-1CEST,M3.5.0,M10.5.0/3",
> -IN_SECONDS(1, 0, 0), -IN_SECONDS(2, 0, 0)},
> >
> > - // END of list
> > - {NULL, NO_TIME, NO_TIME}
> > + /// test parsing errors
> > + // 1. names are too long
> > + {"<+0123456789ABCDEF>3:33:33", 0,
> NO_TIME},
> > + {"JUSTEXCEEDI1:11:11", 0,
> NO_TIME},
> > + {"AVERYLONGNAMEWHICHEXCEEDSTZNAMEMAX2:22:22", 0,
> NO_TIME},
> > + {"FIRSTVERYLONGNAME3:33:33SECONDVERYLONGNAME4:44:44", 0, 0},
> > + {"<JUSTEXCEEDI>5:55:55", 0,
> NO_TIME},
> > + {"<FIRSTVERYLONGNAME>3:33:33<SECONDVERYLONGNAME>4:44:44", 0, 0},
> > + {"<+JUSTEXCEED>5:55:55", 0,
> NO_TIME},
> > +
> > + // 2. names are too short
> > + {"JU6:34:47", 0, NO_TIME},
> > + {"HE6:34:47LO3:34:47", 0, 0},
> > + {"<AB>2:34:47", 0, NO_TIME},
> > + {"<AB>2:34:47<CD>3:34:47", 0, 0},
> > +
> > + // 3. names contain invalid chars
> > + {"N?ME2:10:56", 0, NO_TIME},
> > + {"N!ME2:10:56", 0, NO_TIME},
> > + {"N/ME2:10:56", 0, NO_TIME},
> > + {"N$ME2:10:56", 0, NO_TIME},
> > + {"NAME?2:10:56", 0, NO_TIME},
> > + {"?NAME2:10:56", 0, NO_TIME},
> > + {"NAME?UNK4:21:15", 0, NO_TIME},
> > + {"NAME!UNK4:22:15NEXT/NAME4:23:15", 0, NO_TIME},
> > +
> > + // 4. bogus strings
> > + {"NOINFO", 0, NO_TIME},
> > + {"HOUR:16:18", 0, NO_TIME},
> > + {"<BEGIN", 0, NO_TIME},
> > + {"<NEXT:55", 0, NO_TIME},
> > + {">WRONG<2:15:00", 0, NO_TIME},
> > + {"ST<ART4:30:00", 0, NO_TIME},
> > + //{"MANY8:00:00:00", 0, NO_TIME},
> > + {"\0", 0, NO_TIME},
> > + {"M\0STR7:30:36", 0, NO_TIME}
> > };
> >
> > -// helper macros
> > -#define FOR_TIMEZONES(iter_name) for (struct tz_test* iter_name =
> test_timezones; iter_name->tzstr != NULL; ++iter_name)
> > -
> > // END test vectors
> >
> > static int failed = 0;
> > @@ -136,22 +166,24 @@ void test_TimezoneStrings(void)
> > {
> > char buffer[128];
> >
> > - FOR_TIMEZONES(ptr)
> > + for (int i = 0; i < (sizeof(test_timezones) / sizeof(struct
> tz_test)); ++i)
> > {
> > - setenv("TZ", ptr->tzstr, 1);
> > + struct tz_test ptr = test_timezones[i];
> > +
> > + setenv("TZ", ptr.tzstr, 1);
> > tzset();
> >
> > - snprintf(buffer, 128, "winter time, timezone = \"%s\"",
> ptr->tzstr);
> > + snprintf(buffer, 128, "winter time, timezone = \"%s\"",
> ptr.tzstr);
> >
> > struct tm winter_tm_copy = winter_tm; // copy
> > - TEST_ASSERT_EQUAL_INT_MESSAGE(winter_time +
> ptr->offset_seconds, mktime(&winter_tm_copy), buffer);
> > + TEST_ASSERT_EQUAL_INT_MESSAGE(winter_time + ptr.offset_seconds,
> mktime(&winter_tm_copy), buffer);
> >
> > - if (ptr->dst_offset_seconds != NO_TIME)
> > + if (ptr.dst_offset_seconds != NO_TIME)
> > {
> > - snprintf(buffer, 128, "summer time, timezone = \"%s\"",
> ptr->tzstr);
> > + snprintf(buffer, 128, "summer time, timezone = \"%s\"",
> ptr.tzstr);
> >
> > struct tm summer_tm_copy = summer_tm; // copy
> > - TEST_ASSERT_EQUAL_INT_MESSAGE(summer_time +
> ptr->dst_offset_seconds, mktime(&summer_tm_copy), buffer);
> > + TEST_ASSERT_EQUAL_INT_MESSAGE(summer_time +
> ptr.dst_offset_seconds, mktime(&summer_tm_copy), buffer);
> > }
> > }
> > }
> > --
> > 2.35.1
> >
>
>
More information about the Newlib
mailing list