diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-01-28 16:57:43 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-02-04 09:04:06 +0200 |
| commit | f30a4f0be7c98a93964caa329b3bfe036cefe566 (patch) | |
| tree | c226cc0f676b51e745fa6280b3f4cf270142edad /tests/auto | |
| parent | 5c329f023a29f45a1e87c660554c49fee34dae4b (diff) | |
tst_qdatetime: remove blacklisting and expect failure
Amend ac970d48fdd35b03686d4c77d955875d6e8b1d68 and use
QEXPECT_FAILURE for systemTimeZone test on 32bit systems.
Task-number: QTBUG-89889
Change-Id: I0eed35df871c69a20bcd7c544fc0e9a48dd8db7b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/corelib/time/qdatetime/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/time/qdatetime/BLACKLIST b/tests/auto/corelib/time/qdatetime/BLACKLIST deleted file mode 100644 index 1585e1402e..0000000000 --- a/tests/auto/corelib/time/qdatetime/BLACKLIST +++ /dev/null @@ -1,4 +0,0 @@ -# QTBUG-87663 -[systemTimeZoneChange] -android -b2qt 32bit diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 7a6b92c53f..93dc0192ab 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -3826,6 +3826,10 @@ void tst_QDateTime::systemTimeZoneChange() const useZone.reset(QByteArray("IST-05:30")); QCOMPARE(localDate, QDateTime(QDate(2012, 6, 1), QTime(2, 15, 30), Qt::LocalTime)); + + if constexpr (sizeof(qsizetype) == 4) + QEXPECT_FAIL("", "fails on 32-bit systems (QTBUG-89889)", Continue); + QVERIFY(localMsecs != localDate.toMSecsSinceEpoch()); QCOMPARE(utcDate, QDateTime(QDate(2012, 6, 1), QTime(2, 15, 30), Qt::UTC)); QCOMPARE(utcDate.toMSecsSinceEpoch(), utcMsecs); |