diff options
| author | Piotr Wierciński <piotr.wiercinski@qt.io> | 2024-02-29 11:19:26 +0000 |
|---|---|---|
| committer | Piotr Wierciński <piotr.wiercinski@qt.io> | 2024-03-14 19:11:52 +0100 |
| commit | 4b78ce97b03cea03d4aff5e8c394117bc27f04a0 (patch) | |
| tree | 00f3fad6cd1ff0078547245e51629abd5d969bce /tests/auto/corelib/text/qlocale | |
| parent | 48124977865b76212ef719b19ff37d6bd82ad82d (diff) | |
Revert "wasm: Disable problematic qlocal test for time being"
This reverts commit c23d3ca1f08a7c7c76bb71602a56a79898efa117.
Reason for revert: Update to Emscripten 3.1.50 has been merged.
Change-Id: Ie2082dcc2ee34a6d4e519c143037fda9678be234
Reviewed-by: Even Oscar Andersen <even.oscar.andersen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Diffstat (limited to 'tests/auto/corelib/text/qlocale')
| -rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index c3b17a9bba..8cc7f9af6e 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -2090,10 +2090,6 @@ void tst_QLocale::formatDateTime() QFETCH(QString, format); QFETCH(QString, result); -#if defined(Q_OS_WASM) - QEXPECT_FAIL("dd MMMM yyyy, hh:mm:ss", "Year 0001 doesn't get properly formatted on WASM C locale", Abort); -#endif // Q_OS_WASM - QLocale l(localeName); QCOMPARE(l.toString(dateTime, format), result); QCOMPARE(l.toString(dateTime, QStringView(format)), result); @@ -2118,6 +2114,7 @@ void tst_QLocale::formatTimeZone() const QStringList knownCETus = { u"GMT+1"_s, // ICU u"Central Europe Standard Time"_s, // MS (lacks abbreviations) + u"Central European Standard Time"_s, u"CET"_s // Standard abbreviation }; const QString cet = enUS.toString(QDate(2013, 1, 1).startOfDay(), u"t"); @@ -2127,6 +2124,7 @@ void tst_QLocale::formatTimeZone() const QStringList knownCESTus = { u"GMT+2"_s, // ICU u"Central Europe Summer Time"_s, // MS (lacks abbreviations) + u"Central European Summer Time"_s, u"CEST"_s // Standard abbreviation }; const QString cest = enUS.toString(QDate(2013, 6, 1).startOfDay(), u"t"); |