From 04750432e9004bee048aec50fffbfdba2740581a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 7 Feb 2024 12:46:09 +0100 Subject: [PATCH] nstrftime tests: Avoid test failures on FreeBSD, NetBSD, Android. * tests/test-nstrftime.c (LT): Disable specific test cases on FreeBSD, NetBSD, Android. --- ChangeLog | 6 ++++++ tests/test-nstrftime.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 887b893d32..804a34eeef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-02-07 Bruno Haible + + nstrftime tests: Avoid test failures on FreeBSD, NetBSD, Android. + * tests/test-nstrftime.c (LT): Disable specific test cases on FreeBSD, + NetBSD, Android. + 2024-02-06 Bruno Haible nl_langinfo: Fix fallback list of month names (regression 2014-07-07). diff --git a/tests/test-nstrftime.c b/tests/test-nstrftime.c index 8b9c7797dc..3179da8ada 100644 --- a/tests/test-nstrftime.c +++ b/tests/test-nstrftime.c @@ -125,12 +125,18 @@ struct localtime_rz_test static struct localtime_rz_test LT[] = { +#if !(defined __NetBSD__ || defined __ANDROID__) { TZ+Pacific, 0, "1969-12-31 16:00:00 -0800 (PST)", 0 }, +#endif { TZ+Arizona, 0, "1969-12-31 17:00:00 -0700 (MST)", 0 }, { TZ+UTC , 0, "1970-01-01 00:00:00 +0000 (UTC)", 0 }, +#if !(defined __NetBSD__ || defined __ANDROID__) { TZ+CentEur, 0, "1970-01-01 01:00:00 +0100 (CET)", 0 }, +#endif { TZ+Japan , 0, "1970-01-01 09:00:00 +0900 (JST)", 0 }, +#if !defined __FreeBSD__ { TZ+NZ , 0, "1970-01-01 13:00:00 +1300 (NZDT)", 1 }, +#endif { TZ+Pacific, 500000001, "1985-11-04 16:53:21 -0800 (PST)", 0 }, { TZ+Arizona, 500000001, "1985-11-04 17:53:21 -0700 (MST)", 0 }, { TZ+UTC , 500000001, "1985-11-05 00:53:21 +0000 (UTC)", 0 }, @@ -143,7 +149,7 @@ static struct localtime_rz_test LT[] = { TZ+CentEur, 1000000002, "2001-09-09 03:46:42 +0200 (CEST)", 0 }, { TZ+Japan , 1000000002, "2001-09-09 10:46:42 +0900 (JST)", 0 }, { TZ+NZ , 1000000002, "2001-09-09 13:46:42 +1200 (NZST)", 0 }, -#if TZ_ANGLE_BRACKETS_SHOULD_WORK +#if TZ_ANGLE_BRACKETS_SHOULD_WORK && !defined __FreeBSD__ { TZ+Unknown, 0, "1970-01-01 00:00:00 -0000 (-00)", 0 }, { TZ+Unknown, 500000001, "1985-11-05 00:53:21 -0000 (-00)", 0 }, { TZ+Unknown, 1000000002, "2001-09-09 01:46:42 -0000 (-00)", 0 }, -- 2.39.5