From 3092f367f0529e7035695948b1f1b1bf230bab0d Mon Sep 17 00:00:00 2001 From: Even Oscar Andersen Date: Wed, 6 Mar 2024 11:59:05 +0100 Subject: [PATCH] wasm: Enable the selenium tests on windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit python must be installed with higest version 3.11 Change-Id: I14ca5fa09b088903c95b2f6e2d6ace8400a7b015 Reviewed-by: Qt CI Bot Reviewed-by: Morten Johan Sørvig --- tests/auto/wasm/selenium/CMakeLists.txt | 19 +++++++++++++++++-- tests/auto/wasm/selenium/run.bat | 7 +++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tests/auto/wasm/selenium/run.bat diff --git a/tests/auto/wasm/selenium/CMakeLists.txt b/tests/auto/wasm/selenium/CMakeLists.txt index 043e994ce4..a4963be579 100644 --- a/tests/auto/wasm/selenium/CMakeLists.txt +++ b/tests/auto/wasm/selenium/CMakeLists.txt @@ -14,10 +14,18 @@ qt_internal_add_test(tst_qwasmwindow_harness Qt::Gui ) +if(CMAKE_HOST_WIN32) + SET(RUNSHCMD run.bat) + SET(RUNSHARG "NotUsed") +else() + SET(RUNSHCMD bash) + SET(RUNSHARG run.sh) +endif() + set_target_properties(tst_qwasmwindow_harness PROPERTIES CROSSCOMPILING_EMULATOR "") # disabling emrun qt_internal_create_test_script(NAME tst_qwasmwindow_harness - COMMAND bash - ARGS run.sh + COMMAND ${RUNSHCMD} + ARGS ${RUNSHARG} WORKING_DIRECTORY "${test_working_dir}" OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/tst_qwasmwindow_harnessWrapper$.cmake" ) @@ -49,3 +57,10 @@ add_custom_command( ${CMAKE_CURRENT_SOURCE_DIR}/run.sh ${CMAKE_CURRENT_BINARY_DIR}/run.sh ) + +add_custom_command( + TARGET tst_qwasmwindow_harness POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/run.bat + ${CMAKE_CURRENT_BINARY_DIR}/run.bat +) diff --git a/tests/auto/wasm/selenium/run.bat b/tests/auto/wasm/selenium/run.bat new file mode 100644 index 0000000000..031e0b13ab --- /dev/null +++ b/tests/auto/wasm/selenium/run.bat @@ -0,0 +1,7 @@ +:: +:: The highest version of python that can be used is 3.11 +:: Download from here: https://www.python.org/downloads/release/python-3118/ +:: +start "qtwasmserver.py" python qtwasmserver.py -p 8001 +python qwasmwindow.py +taskkill /FI "WINDOWTITLE eq qtwasmserver.py"