From 99499a6fae8c3243c9e5e480e118fc5d2c8739cd Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Sat, 19 Aug 2023 13:46:26 -0600 Subject: [PATCH] Ladybird+Meta: Add ctest to run WPT in the Integration configuration By running ctest -C Integration -R WPT, you can run WPT. Adding just -C Integration will run all other tests *and* the WPT test. Also add support for ./Meta/serenity.sh test lagom WPT to serenity.sh --- Ladybird/CMakeLists.txt | 11 ++++++++++- Meta/serenity.sh | 10 ++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index 318bf6bd25e..032e1ffc9b6 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -219,5 +219,14 @@ if (BUILD_TESTING) NAME LibWeb COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../bin/headless-browser --run-tests ${SERENITY_SOURCE_DIR}/Tests/LibWeb ) - set_tests_properties(LibWeb PROPERTIES ENVIRONMENT QT_QPA_PLATFORM=offscreen) + add_test( + NAME WPT + CONFIGURATIONS Integration + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/LibWeb/WPT/run.sh + ) + set_tests_properties(LibWeb WPT PROPERTIES + DEPENDS ladybird + ENVIRONMENT QT_QPA_PLATFORM=offscreen + ENVIRONMENT "SERENITY_SOURCE_DIR=${SERENITY_SOURCE_DIR}" + ) endif() diff --git a/Meta/serenity.sh b/Meta/serenity.sh index 5877d2772ac..7fbae79a10c 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -256,12 +256,14 @@ ensure_target() { run_tests() { local TEST_NAME="$1" - export CTEST_OUTPUT_ON_FAILURE=1 + local CTEST_ARGS=("--output-on-failure" "--test-dir" "$BUILD_DIR") if [ -n "$TEST_NAME" ]; then - ( cd "$BUILD_DIR" && ctest -R "$TEST_NAME" ) - else - ( cd "$BUILD_DIR" && ctest ) + if [ "$TEST_NAME" = "WPT" ]; then + CTEST_ARGS+=("-C" "Integration") + fi + CTEST_ARGS+=("-R" "$TEST_NAME") fi + ctest "${CTEST_ARGS[@]}" } build_target() {