diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-02-15 15:56:26 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-02-18 11:20:23 +0100 |
| commit | 60fd2808f6b629b9d5b054182f947e9a05738082 (patch) | |
| tree | fed12bf20b0f06ce07c207308642c31e5eea3695 /tests/auto/corelib | |
| parent | 868242b6e1840fcea491ad86d8b2a7a101c4eeaa (diff) | |
Skip a timezone transition test on Android
Its back-end lacks transition data, so the test can't possibly
succeed. Make the skip conditional on the tested zone having
transitions, so that the test will come back into play if we ever gain
support for transitions on Android.
Fixes: QTBUG-69129
Change-Id: Ie4f96601b8b18cd496efbde7cf2557875cf3c1c9
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/corelib/time/qtimezone/BLACKLIST b/tests/auto/corelib/time/qtimezone/BLACKLIST index 9d523d50bc..08fcd041ca 100644 --- a/tests/auto/corelib/time/qtimezone/BLACKLIST +++ b/tests/auto/corelib/time/qtimezone/BLACKLIST @@ -1,6 +1,4 @@ -# QTBUG-69129 -[specificTransition] -android +# See qtbase/src/testlib/qtestblacklist.cpp for format # QTBUG-69131 [transitionEachZone:America/Cancun@2010] diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index 1d09a84477..bf6a3f223d 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -517,6 +517,10 @@ void tst_QTimeZone::specificTransition_data() QTest::addColumn<int>("offset"); QTest::addColumn<int>("stdoff"); QTest::addColumn<int>("dstoff"); +#ifdef Q_OS_ANDROID + if (!QTimeZone("Europe/Moscow").hasTransitions()) + QSKIP("Android time-zone back-end has no transition data"); +#endif // Moscow ditched DST on 2010-10-31 but has since changed standard offset twice. #ifdef USING_WIN_TZ |