From: Bruno Haible Date: Mon, 3 Jun 2024 18:07:03 +0000 (+0200) Subject: nstrftime, c-nstrftime tests: Avoid some failures on native Windows. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=233609627566570d23da7391f6686642e59d6518;p=gnulib.git nstrftime, c-nstrftime tests: Avoid some failures on native Windows. * tests/test-nstrftime.h (TZ): Use time zone names that are supported by native Windows. (LT): Disable two more tests on native Windows. --- diff --git a/ChangeLog b/ChangeLog index 7d9726d61c..bbb3fa1e60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-06-03 Bruno Haible + + nstrftime, c-nstrftime tests: Avoid some failures on native Windows. + * tests/test-nstrftime.h (TZ): Use time zone names that are supported by + native Windows. + (LT): Disable two more tests on native Windows. + 2024-06-03 Paul Eggert attribute: improve comments diff --git a/tests/test-nstrftime.h b/tests/test-nstrftime.h index 50c270440d..b822f3acd1 100644 --- a/tests/test-nstrftime.h +++ b/tests/test-nstrftime.h @@ -102,7 +102,11 @@ struct tzalloc_test static struct tzalloc_test TZ[] = { #define Pacific 0 +#if defined _WIN32 && !defined __CYGWIN__ + { 0, "PST8PDT" }, +#else { 0, "PST8PDT,M3.2.0,M11.1.0" }, +#endif #define Arizona 1 { 0, "MST7" }, @@ -111,7 +115,11 @@ static struct tzalloc_test TZ[] = { 0, 0 }, #define CentEur 3 +#if defined _WIN32 && !defined __CYGWIN__ + { 0, "CET-1CEST" }, +#else { 0, "CET-1CEST,M3.5.0,M10.5.0/3" }, +#endif #define Japan 4 { 0, "JST-9" }, @@ -163,10 +171,14 @@ static struct localtime_rz_test LT[] = { TZ+CentEur, 500000001, "1985-11-05 01:53:21 +0100 (CET)", 1 }, { TZ+Japan , 500000001, "1985-11-05 09:53:21 +0900 (JST)", 0 }, { TZ+NZ , 500000001, "1985-11-05 13:53:21 +1300 (NZDT)", 0 }, +#if !(defined _WIN32 && !defined __CYGWIN__) { TZ+Pacific, 1000000002, "2001-09-08 18:46:42 -0700 (PDT)", 0 }, +#endif { TZ+Arizona, 1000000002, "2001-09-08 18:46:42 -0700 (MST)", 0 }, { TZ+UTC , 1000000002, "2001-09-09 01:46:42 +0000 (UTC)", 0 }, +#if !(defined _WIN32 && !defined __CYGWIN__) { TZ+CentEur, 1000000002, "2001-09-09 03:46:42 +0200 (CEST)", 0 }, +#endif { TZ+Japan , 1000000002, "2001-09-09 10:46:42 +0900 (JST)", 0 }, #if !(defined _WIN32 && !defined __CYGWIN__) { TZ+NZ , 1000000002, "2001-09-09 13:46:42 +1200 (NZST)", 0 },