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

wasm: enable previously disabled tests on WebAssembly

Browse Source 
The supported configurations for running tests on WebAsssembly
are:

  * -device-option QT_EMSCRIPTEN_ASYNCIFY=1" [old way]
  * -feature-wasm-jspi -feature-wasm-exceptions.  [new way]

(Non-asyncify/JSPI configs may work for some tests, especially
non-GUI tests).

In general all tests are now enabled for the wasm build so that
we can run the tests locally, even tests which fail/crash/hang.

Use QT_BUILD_WASM_BATCHED_TESTS to disable tests which should
not run on CI.

Task-number: QTBUG-121822
Change-Id: I20fac091d4d55bd1c947eeeb128a42a382dc11f0
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
This commit is contained in:
Morten Sørvig 2024-10-10 13:42:28 +02:00 committed by Morten Johan Sørvig
parent 68346b2d1c
commit a65554044c
8 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/CMakeLists.txt
View File

@ -65,9 +65,7 @@ if(QT_BUILD_WASM_BATCHED_TESTS)
add_subdirectory(corelib/io/qdataurl) add_subdirectory(corelib/io/qdataurl)
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
add_subdirectory(corelib/io/qsettings) add_subdirectory(corelib/io/qsettings)
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)

2
tests/auto/corelib/global/CMakeLists.txt
View File

@ -5,9 +5,7 @@ add_subdirectory(qcheckedint)
if(NOT INTEGRITY) if(NOT INTEGRITY)
add_subdirectory(qcompare) add_subdirectory(qcompare)
endif() endif()
if(NOT WASM) # QTBUG-121822
add_subdirectory(qcomparehelpers) add_subdirectory(qcomparehelpers)
endif()
add_subdirectory(qflags) add_subdirectory(qflags)
add_subdirectory(q_func_info) add_subdirectory(q_func_info)
add_subdirectory(qgetputenv) add_subdirectory(qgetputenv)

2
tests/auto/corelib/io/CMakeLists.txt
View File

@ -63,9 +63,7 @@ if(QT_FEATURE_processenvironment)
add_subdirectory(qprocessenvironment) add_subdirectory(qprocessenvironment)
endif() endif()
if(QT_FEATURE_settings AND TARGET Qt::Gui) if(QT_FEATURE_settings AND TARGET Qt::Gui)
if(NOT WASM) # QTBUG-121822
add_subdirectory(qsettings) add_subdirectory(qsettings)
endif()
endif() endif()
if(QT_FEATURE_private_tests) if(QT_FEATURE_private_tests)
add_subdirectory(qzip) add_subdirectory(qzip)

2
tests/auto/corelib/itemmodels/CMakeLists.txt
View File

@ -6,9 +6,7 @@ add_subdirectory(qgenericitemmodel)
if(TARGET Qt::Gui) if(TARGET Qt::Gui)
add_subdirectory(qabstractitemmodel) add_subdirectory(qabstractitemmodel)
if(QT_FEATURE_proxymodel) if(QT_FEATURE_proxymodel)
if (NOT WASM) # QTBUG-121822
add_subdirectory(qabstractproxymodel) add_subdirectory(qabstractproxymodel)
endif()
add_subdirectory(qconcatenatetablesproxymodel) add_subdirectory(qconcatenatetablesproxymodel)
add_subdirectory(qidentityproxymodel) add_subdirectory(qidentityproxymodel)
add_subdirectory(qsortfilterproxymodel_recursive) add_subdirectory(qsortfilterproxymodel_recursive)

11
tests/auto/corelib/serialization/CMakeLists.txt
View File

@ -2,19 +2,14 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
add_subdirectory(json) add_subdirectory(json)
if (NOT WASM) # QTBUG-121822
add_subdirectory(qcborstreamreader) add_subdirectory(qcborstreamreader)
endif()
if(QT_FEATURE_cborstreamwriter) if(QT_FEATURE_cborstreamwriter)
if (NOT WASM) # QTBUG-121822
add_subdirectory(qcborstreamwriter) add_subdirectory(qcborstreamwriter)
endif()
endif() endif()
# also (but not only!) QTBUG-121822: add_subdirectory(qcborvalue)
if(NOT WASM) if (NOT QT_BUILD_WASM_BATCHED_TESTS)
add_subdirectory(qcborvalue) add_subdirectory(qcborvalue_json)
endif() endif()
add_subdirectory(qcborvalue_json)
if(TARGET Qt::Gui) if(TARGET Qt::Gui)
add_subdirectory(qdatastream) add_subdirectory(qdatastream)
add_subdirectory(qdatastream_core_pixmap) add_subdirectory(qdatastream_core_pixmap)

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

@ -1,9 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd. # Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
if (NOT WASM) # QTBUG-121822
add_subdirectory(qanystringview) add_subdirectory(qanystringview)
endif()
add_subdirectory(qbytearray) add_subdirectory(qbytearray)
add_subdirectory(qbytearray_large) add_subdirectory(qbytearray_large)
add_subdirectory(qbytearrayapisymmetry) add_subdirectory(qbytearrayapisymmetry)
@ -15,12 +13,10 @@ add_subdirectory(qchar)
add_subdirectory(qcollator) add_subdirectory(qcollator)
add_subdirectory(qlatin1stringmatcher) add_subdirectory(qlatin1stringmatcher)
add_subdirectory(qlatin1stringview) add_subdirectory(qlatin1stringview)
if (NOT WASM) # QTBUG-133219 if(NOT QT_BUILD_WASM_BATCHED_TESTS)
add_subdirectory(qlocale) add_subdirectory(qlocale)
endif() endif()
if (NOT WASM) # QTBUG-121822
add_subdirectory(qregularexpression) add_subdirectory(qregularexpression)
endif()
add_subdirectory(qstring) add_subdirectory(qstring)
add_subdirectory(qstring_no_cast_from_bytearray) add_subdirectory(qstring_no_cast_from_bytearray)
add_subdirectory(qstringapisymmetry) add_subdirectory(qstringapisymmetry)

2
tests/auto/corelib/tools/CMakeLists.txt
View File

@ -49,9 +49,7 @@ add_subdirectory(qshareddatapointer)
add_subdirectory(qsharedpointer) add_subdirectory(qsharedpointer)
add_subdirectory(qsize) add_subdirectory(qsize)
add_subdirectory(qsizef) add_subdirectory(qsizef)
if (NOT WASM) # QTBUG-121822
add_subdirectory(qspan) add_subdirectory(qspan)
endif()
add_subdirectory(qstl) add_subdirectory(qstl)
add_subdirectory(quniquehandle) add_subdirectory(quniquehandle)
add_subdirectory(qvarlengtharray) add_subdirectory(qvarlengtharray)

2
tests/auto/network/access/CMakeLists.txt
View File

@ -14,9 +14,7 @@ add_subdirectory(qnetworkcachemetadata)
add_subdirectory(qabstractnetworkcache) add_subdirectory(qabstractnetworkcache)
if(QT_FEATURE_http) if(QT_FEATURE_http)
add_subdirectory(qnetworkreply_local) add_subdirectory(qnetworkreply_local)
if(NOT WASM) # QTBUG-121822
add_subdirectory(qformdatabuilder) add_subdirectory(qformdatabuilder)
endif()
add_subdirectory(qnetworkrequestfactory) add_subdirectory(qnetworkrequestfactory)
add_subdirectory(qrestaccessmanager) add_subdirectory(qrestaccessmanager)
endif() endif()