diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-01-08 13:48:51 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-01-18 15:55:15 +0100 |
| commit | 6ee13db700eecd8dfed54a9ec2d1081b39511562 (patch) | |
| tree | 46c103be4c244a58c3bffbb1662642c3f2eaded9 /tests/auto/corelib/time/qtimezone/BLACKLIST | |
| parent | 50c63446f525a8625b6315597cb0897d89908d6b (diff) | |
Correct string comparison in Android's IANA ID matching code
It used QString.compare() and assumed it was returning a bool true on
equality, when it actually returns an int that compares to 0 as the
given strings compare. So it should use compare() == 0.
This fixes several of QTimeZone's blacklisted tests on Android and a
crasher, which we dodged with a QSKIP. Added an id-comparison to a
test. Gave two local variables more informative names, made an early
return into a QSKIP so it explains itself.
Fixes: QTBUG-89905
Fixes: QTBUG-69122
Fixes: QTBUG-69132
Fixes: QTBUG-87435
Pick-to: 6.0 5.15
Change-Id: Icf18ed5a810143d6e65d36e34a70e82faac10b8e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tests/auto/corelib/time/qtimezone/BLACKLIST')
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/BLACKLIST | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/tests/auto/corelib/time/qtimezone/BLACKLIST b/tests/auto/corelib/time/qtimezone/BLACKLIST index ddc9a107c0..1f4811d4b8 100644 --- a/tests/auto/corelib/time/qtimezone/BLACKLIST +++ b/tests/auto/corelib/time/qtimezone/BLACKLIST @@ -1,7 +1,3 @@ -# QTBUG-69122 -[dataStreamTest] -android - # QTBUG-69129 [specificTransition] android @@ -173,14 +169,3 @@ android android [transitionEachZone:America/Danmarkshavn@1970] android -# QTBUG-87435 -[createTest] -android -[systemZone] -android -[utcOffsetId] -android -[stressTest] -android -[serialize] -android |