whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "wasm: Disable problematic qlocal test for time being" 

This reverts commit c23d3ca1f0.

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>
bb10
Piotr Wierciński 2024-02-29 11:19:26 +00:00
parent 4812497786
commit 4b78ce97b0
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/text/CMakeLists.txt
View File

@ -26,6 +26,4 @@ add_subdirectory(qstringtokenizer)
add_subdirectory(qstringview)
add_subdirectory(qtextboundaryfinder)
add_subdirectory(qunicodetools)
if(NOT WASM)
add_subdirectory(qlocale)
endif()
add_subdirectory(qlocale)

6
tests/auto/corelib/text/qlocale/tst_qlocale.cpp
View File

@ -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");