1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: Add corelib/io/qdebug test

Browse Source 
QSKIP the threadSafety test, which does not run on wasm

Change-Id: I297318fce363f55c135179e88b20d7256502fc15
Reviewed-by: Lorn Potter <lorn.potter@qt.io>
This commit is contained in:
Even Oscar Andersen 2024-08-01 13:34:59 +02:00
parent f90e29fd5c
commit 95b39102d6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/CMakeLists.txt
View File

@ -66,13 +66,18 @@ if(QT_BUILD_WASM_BATCHED_TESTS)
add_subdirectory(corelib/io/qbuffer) add_subdirectory(corelib/io/qbuffer)
add_subdirectory(corelib/io/qabstractfileengine) add_subdirectory(corelib/io/qabstractfileengine)
if(NOT WASM) # QTBUG-121822 if(NOT WASM) # QTBUG-121822
add_subdirectory(corelib/io/qsettings) add_subdirectory(corelib/io/qsettings)
endif() endif()
add_subdirectory(corelib/io/qstorageinfo) add_subdirectory(corelib/io/qstorageinfo)
add_subdirectory(corelib/io/qstandardpaths) add_subdirectory(corelib/io/qstandardpaths)
add_subdirectory(corelib/io/qfileselector) add_subdirectory(corelib/io/qfileselector)
add_subdirectory(corelib/io/qfile) add_subdirectory(corelib/io/qfile)
add_subdirectory(corelib/io/qdir) add_subdirectory(corelib/io/qdir)
if(TARGET Qt::Concurrent)
if(NOT INTEGRITY)
add_subdirectory(corelib/io/qdebug)
endif()
endif()
add_subdirectory(corelib/serialization) add_subdirectory(corelib/serialization)
add_subdirectory(corelib/text) add_subdirectory(corelib/text)
add_subdirectory(corelib/thread) add_subdirectory(corelib/thread)

4
tests/auto/corelib/io/qdebug/tst_qdebug.cpp
View File

@ -1341,6 +1341,9 @@ static void doDebug() // called in each thread
void tst_QDebug::threadSafety() const void tst_QDebug::threadSafety() const
{ {
#ifdef Q_OS_WASM
QSKIP("threadSafety does not run on wasm");
#else
MessageHandlerSetter mhs(threadSafeMessageHandler); MessageHandlerSetter mhs(threadSafeMessageHandler);
const int numThreads = 10; const int numThreads = 10;
QThreadPool::globalInstance()->setMaxThreadCount(numThreads); QThreadPool::globalInstance()->setMaxThreadCount(numThreads);
@ -1355,6 +1358,7 @@ void tst_QDebug::threadSafety() const
for (int i = 0; i < numThreads; ++i) { for (int i = 0; i < numThreads; ++i) {
QCOMPARE(s_messages.at(i), QStringLiteral("doDebug")); QCOMPARE(s_messages.at(i), QStringLiteral("doDebug"));
} }
#endif
} }
void tst_QDebug::toString() const void tst_QDebug::toString() const