whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasm: Add missing batchtestrunner files to copy logic 

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 <Mikolaj.Boc@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
bb10
David Skoland 2022-10-18 10:05:30 +02:00
parent cbd688d410
commit ffb44ad8ef
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/Qt6WasmMacros.cmake
View File

@ -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"

5
src/testlib/CMakeLists.txt
View File

@ -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}