summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/time/qtimezone/BLACKLIST4
-rw-r--r--tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp4
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