diff options
author | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-09-02 19:23:30 +0200 |
---|---|---|
committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-10-05 00:36:41 +0200 |
commit | b9887d51c396d126dd1dfc67a18a7de361db205b (patch) | |
tree | 58275cd8bf640a13c7e21780f890f99e033363eb /src | |
parent | 2a47bb221dacefbc606ca24ba8d926009c067fa4 (diff) |
Provide visual output in page in WASM test runner
There will now be a visual output in page if the qvisualoutput query
parameter is supplied. This simplifies debugging.
The main html resource has been renamed test_batch.html to reflect
the name of the actual test unit, not functionality.
Change-Id: Ib6cd4712de9c47cfcc5f670e7b34f998858f99b7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/Qt6WasmMacros.cmake | 4 | ||||
-rw-r--r-- | src/testlib/CMakeLists.txt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake index d86c7202db..c248331e61 100644 --- a/src/corelib/Qt6WasmMacros.cmake +++ b/src/corelib/Qt6WasmMacros.cmake @@ -29,6 +29,8 @@ function(_qt_internal_wasm_add_target_helpers target) if(is_test) configure_file("${WASM_BUILD_DIR}/libexec/batchedtestrunner.html" "${target_output_directory}/batchedtestrunner.html" COPYONLY) + configure_file("${WASM_BUILD_DIR}/libexec/qtestoutputreporter.css" + "${target_output_directory}/qtestoutputreporter.css" COPYONLY) configure_file("${WASM_BUILD_DIR}/libexec/batchedtestrunner.js" "${target_output_directory}/batchedtestrunner.js" COPYONLY) configure_file("${WASM_BUILD_DIR}/libexec/emrunadapter.js" @@ -37,6 +39,8 @@ function(_qt_internal_wasm_add_target_helpers target) "${target_output_directory}/qwasmjsruntime.js" COPYONLY) configure_file("${WASM_BUILD_DIR}/libexec/qwasmtestmain.js" "${target_output_directory}/qwasmtestmain.js" COPYONLY) + configure_file("${WASM_BUILD_DIR}/libexec/qtestoutputreporter.js" + "${target_output_directory}/qtestoutputreporter.js" COPYONLY) configure_file("${WASM_BUILD_DIR}/libexec/util.js" "${target_output_directory}/util.js" COPYONLY) else() diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 4b6e2921e7..37f0188006 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -178,6 +178,10 @@ if(QT_FEATURE_batch_test_support AND WASM) list(APPEND wasm_support_libexec_files ${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/qwasmtestmain.js) list(APPEND wasm_support_libexec_files + ${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/qtestoutputreporter.js) + list(APPEND wasm_support_libexec_files + ${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/qtestoutputreporter.css) + list(APPEND wasm_support_libexec_files ${QtBase_SOURCE_DIR}/util/wasm/batchedtestrunner/util.js) qt_path_join(libexec_dir ${QT_INSTALL_DIR} ${INSTALL_LIBEXECDIR}) |