diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-27 07:32:39 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-27 07:32:39 +0200 |
| commit | 66fdcd86c7de338563e5da1477481a940ab3bd52 (patch) | |
| tree | c52cf7026599e68b10c533f568b132864e8573c4 /tests/test-eds-ics-tzids.cpp | |
| parent | b0d110bac6f1f10a949abb7f985ea4becda75488 (diff) | |
| parent | 17aa86ab53e3e49cd47116f9640c89484167abcd (diff) | |
| download | ayatana-indicator-datetime-66fdcd86c7de338563e5da1477481a940ab3bd52.tar.gz ayatana-indicator-datetime-66fdcd86c7de338563e5da1477481a940ab3bd52.tar.bz2 ayatana-indicator-datetime-66fdcd86c7de338563e5da1477481a940ab3bd52.zip | |
Merge branch 'tari01-pr/fix-g-time-zone-new'
Attributes GH PR #41: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/41
Diffstat (limited to 'tests/test-eds-ics-tzids.cpp')
| -rw-r--r-- | tests/test-eds-ics-tzids.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/test-eds-ics-tzids.cpp b/tests/test-eds-ics-tzids.cpp index 41d8214..c80feb2 100644 --- a/tests/test-eds-ics-tzids.cpp +++ b/tests/test-eds-ics-tzids.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> */ #include <algorithm> @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MultipleAppointments) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"Europe/Berlin"}; auto tz = std::make_shared<MockTimezone>(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared<SimpleRangePlanner>(engine, tz); |