diff options
author | Liang Qi <liang.qi@qt.io> | 2019-03-31 12:39:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-03-31 12:39:42 +0200 |
commit | 29f01b32f58573b23bd35857376f6f92e15382a3 (patch) | |
tree | b1a044f87e4b18d5ddd779dc1b63161ded1c3d1a /tests/auto/corelib/tools/qtimezone | |
parent | 300940a6c9eb0f74cefda7d76a5d19f56ec50253 (diff) | |
parent | 0a7302abbc47a0db25f119ee4f5144bbaf0d9d6f (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/configure.json
Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919
Diffstat (limited to 'tests/auto/corelib/tools/qtimezone')
-rw-r--r-- | tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp index fc4cb717ec..e1bb3149c6 100644 --- a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp @@ -538,6 +538,8 @@ void tst_QTimeZone::checkOffset_data() int year, month, day, hour, min, sec; int std, dst; } table[] = { + // Zone with no transitions (QTBUG-74614, when TZ backend uses minimalist data) + { "Etc/UTC", "epoch", 1970, 1, 1, 0, 0, 0, 0, 0 }, // Kiev: regression test for QTBUG-64122 (on MS): { "Europe/Kiev", "summer", 2017, 10, 27, 12, 0, 0, 2 * 3600, 3600 }, { "Europe/Kiev", "winter", 2017, 10, 29, 12, 0, 0, 2 * 3600, 0 } @@ -550,6 +552,8 @@ void tst_QTimeZone::checkOffset_data() << QDateTime(QDate(entry.year, entry.month, entry.day), QTime(entry.hour, entry.min, entry.sec), zone) << entry.dst + entry.std << entry.std << entry.dst; + } else { + qWarning("Skipping %s@%s test as zone is invalid", entry.zone, entry.nick); } } } |