From ffb44ad8ef29dd824da2ad375bab2c2d3a55e76a Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 18 Oct 2022 10:05:30 +0200 Subject: [PATCH] wasm: Add missing batchtestrunner files to copy logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtestoutputreporter.js and qtestoutputreporter.css were added to the batchtestrunner, but not to the list of files copied from sources, so make sure to add those and add a note for future reference. Change-Id: If7f323b3051ee9b6fb4bedc3ee314e4941b41f0b Reviewed-by: Mikołaj Boc Reviewed-by: Morten Johan Sørvig --- src/corelib/Qt6WasmMacros.cmake | 1 + src/testlib/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake index 2276fcf6da..5e9d817536 100644 --- a/src/corelib/Qt6WasmMacros.cmake +++ b/src/corelib/Qt6WasmMacros.cmake @@ -27,6 +27,7 @@ function(_qt_internal_wasm_add_target_helpers target) get_target_property(is_test ${target} _qt_is_test_executable) if(is_test) + # Keep in sync with testrunner_files in testlib/CMakeLists.txt configure_file("${WASM_BUILD_DIR}/libexec/batchedtestrunner.html" "${target_output_directory}/${_target_output_name}.html" COPYONLY) configure_file("${WASM_BUILD_DIR}/libexec/qtestoutputreporter.css" diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index d4ce25ba0d..fa967ca43c 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -166,13 +166,16 @@ if(QT_FEATURE_private_tests) endif() if(WASM) + # Keep in sync with is_test files in Qt6WasmMacros.cmake set(testrunner_files "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/batchedtestrunner.html" "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/batchedtestrunner.js" "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/emrunadapter.js" "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/qwasmjsruntime.js" "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/qwasmtestmain.js" - "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/util.js") + "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/util.js" + "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/qtestoutputreporter.js" + "${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/qtestoutputreporter.css") qt_path_join(install_dir_libexec "${QT_INSTALL_DIR}" "${INSTALL_LIBEXECDIR}") qt_copy_or_install(FILES ${testrunner_files}