From b4090305d0b95fbe6b9bd211ab8856c90bc13be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Thu, 11 Apr 2024 11:58:42 +0200 Subject: [PATCH] wasm: introduce QT_BUILD_WASM_BATCHED_TESTS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We are selecting a subset of the tests for batching/CI, however this is done for the WASM configuration which interferes with non-batched tests. - we can only build and run tests which are in the batching subset - we are enabling threading tests which breaks the no-thread configuration. Add QT_BUILD_WASM_BATCHED_TESTS and enable for WASM and batching. There's then no restrictions on which tests can be selected for CI. Change-Id: I59a67b63e80cd00676cb28f916951d2a52b0ee2c Reviewed-by: Jøger Hansegård Reviewed-by: Morten Johan Sørvig --- cmake/QtBuildOptionsHelpers.cmake | 12 +++++++----- tests/auto/CMakeLists.txt | 2 +- tests/auto/corelib/thread/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmake/QtBuildOptionsHelpers.cmake b/cmake/QtBuildOptionsHelpers.cmake index 6f795e2ec2b..3879920f65d 100644 --- a/cmake/QtBuildOptionsHelpers.cmake +++ b/cmake/QtBuildOptionsHelpers.cmake @@ -262,14 +262,16 @@ macro(qt_internal_setup_build_tests) option(QT_BUILD_MANUAL_TESTS "Build Qt manual tests" OFF) - if(WASM) - option(QT_BUILD_MINIMAL_STATIC_TESTS "Build minimal subset of tests for static Qt builds" - ON) + if(WASM AND _qt_batch_tests) + set(_qt_wasm_and_batch_tests ON) else() - option(QT_BUILD_MINIMAL_STATIC_TESTS "Build minimal subset of tests for static Qt builds" - OFF) + set(_qt_wasm_and_batch_tests OFF) endif() + option(QT_BUILD_MINIMAL_STATIC_TESTS "Build minimal subset of tests for static Qt builds" ${_qt_wasm_and_batch_tests}) + + option(QT_BUILD_WASM_BATCHED_TESTS "Build subset of tests for wasm batched tests" ${_qt_wasm_and_batch_tests}) + option(QT_BUILD_MINIMAL_ANDROID_MULTI_ABI_TESTS "Build minimal subset of tests for Android multi-ABI Qt builds" OFF) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index bd2cbcd72bf..04a4fff9044 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -56,7 +56,7 @@ if(QT_BUILD_MINIMAL_ANDROID_MULTI_ABI_TESTS) return() endif() -if(WASM) +if(QT_BUILD_WASM_BATCHED_TESTS) add_subdirectory(corelib/io/qdiriterator) add_subdirectory(corelib/io/largefile) add_subdirectory(corelib/io/qdataurl) diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt index 5889f4249f2..68110b652b2 100644 --- a/tests/auto/corelib/thread/CMakeLists.txt +++ b/tests/auto/corelib/thread/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(WASM) # not all tests currently work in WebAssembly +if(QT_BUILD_WASM_BATCHED_TESTS) # not all tests currently work in WebAssembly add_subdirectory(qatomicint) add_subdirectory(qatomicinteger) add_subdirectory(qatomicpointer)