test: suppress fails on the Africa/Tripoli (Libya) timezone

As it switched between CET and EET multiple times in the past, causing
random fails with certain historical timestamps:

834/1524 test - systemd:test-time-util     FAIL    0.96s   killed by signal 6 SIGABRT
 ...
TZ=Africa/Tripoli, tzname[0]=EET, tzname[1]=CEST
@378687574661411 → Thu 1981-12-31 23:59:34 CET → @378683974000000 → Thu 1981-12-31 23:59:34 EET
src/test/test-time-util.c:450: Assertion failed: Expected "ignore" to be true
/builddir/build/BUILD/systemd-261.1-build/systemd-261.1/tools/test-crash-trace.sh: line 18: 87088 Aborted                    (core dumped) "$@"

diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
index 8250a03e29876c9517889f060dbee958659b6c4d..392b06214b0ff435e4013bf13bb1aff29319a8da 100644 (file)
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -436,9 +436,11 @@ static void test_format_timestamp_impl(usec_t x) {
         /* When the timezone is built with rearguard being enabled (e.g. old Ubuntu and RHEL), the timezone
          * Africa/Windhoek may provide time shifted 1 hour from the original. See
          * https://github.com/systemd/systemd/issues/28472 and https://github.com/systemd/systemd/pull/35471.
-         * Also, the same may happen on MSK timezone (e.g. Europe/Volgograd or Europe/Kirov). */
+         * Also, the same may happen on MSK timezone (e.g. Europe/Volgograd or Europe/Kirov), or on
+         * Africa/Tripoli (Libya) which switched between CET and EET multiple times historically, causing
+         * certain timestamps to round-trip with a 1h offset. */
         bool ignore =
-                (streq_ptr(getenv("TZ"), "Africa/Windhoek") ||
+                (STRPTR_IN_SET(getenv("TZ"), "Africa/Windhoek", "Africa/Tripoli", "Libya") ||
                  STRPTR_IN_SET(get_tzname(/* dst= */ false), "CAT", "EAT", "MSK", "WET")) &&
                 (x_sec > y_sec ? x_sec - y_sec : y_sec - x_sec) == 3600;
 
@@ -464,6 +466,10 @@ static void test_format_timestamp_loop(void) {
         /* With tzdata-2025c, the timestamp (randomly?) fails on MSK time zone (e.g. Europe/Volgograd). */
         test_format_timestamp_impl(1414277092997572);
 
+        /* Africa/Tripoli (Libya) switched from CET to EET multiple times in the past, causing a 1h
+         * round-trip discrepancy for historical timestamps. */
+        test_format_timestamp_impl(378687574661411);
+
         for (unsigned i = 0; i < TRIAL; i++) {
                 usec_t x;