From 95b39102d697add635cbb6696888aa5fc4c13711 Mon Sep 17 00:00:00 2001 From: Even Oscar Andersen Date: Thu, 1 Aug 2024 13:34:59 +0200 Subject: [PATCH] wasm: Add corelib/io/qdebug test QSKIP the threadSafety test, which does not run on wasm Change-Id: I297318fce363f55c135179e88b20d7256502fc15 Reviewed-by: Lorn Potter --- tests/auto/CMakeLists.txt | 7 ++++++- tests/auto/corelib/io/qdebug/tst_qdebug.cpp | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index bbcf5d1f85c..fc33004b8b6 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -66,13 +66,18 @@ if(QT_BUILD_WASM_BATCHED_TESTS) add_subdirectory(corelib/io/qbuffer) add_subdirectory(corelib/io/qabstractfileengine) if(NOT WASM) # QTBUG-121822 - add_subdirectory(corelib/io/qsettings) + add_subdirectory(corelib/io/qsettings) endif() add_subdirectory(corelib/io/qstorageinfo) add_subdirectory(corelib/io/qstandardpaths) add_subdirectory(corelib/io/qfileselector) add_subdirectory(corelib/io/qfile) 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/text) add_subdirectory(corelib/thread) diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp index 14d503076c2..0667badfa31 100644 --- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp +++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp @@ -1341,6 +1341,9 @@ static void doDebug() // called in each thread void tst_QDebug::threadSafety() const { +#ifdef Q_OS_WASM + QSKIP("threadSafety does not run on wasm"); +#else MessageHandlerSetter mhs(threadSafeMessageHandler); const int numThreads = 10; QThreadPool::globalInstance()->setMaxThreadCount(numThreads); @@ -1355,6 +1358,7 @@ void tst_QDebug::threadSafety() const for (int i = 0; i < numThreads; ++i) { QCOMPARE(s_messages.at(i), QStringLiteral("doDebug")); } +#endif } void tst_QDebug::toString() const