From f739e976a46e2300022dca92c0f0caa18188443e Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Wed, 7 Feb 2024 09:10:52 -0700 Subject: [PATCH] Tests: Pass App Bundle path to WebDriver to WPT CTest test on macOS The WebDriver binary in ${CMAKE_CURRENT_BINARY_DIR}/bin doesn't actually have access to the Ladybird binary in the default CMake setup. --- Ladybird/CMakeLists.txt | 5 +++++ Tests/LibWeb/WPT/run.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index 6b04edca06..7258d7d06b 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -269,4 +269,9 @@ if (BUILD_TESTING) ENVIRONMENT QT_QPA_PLATFORM=offscreen ENVIRONMENT "SERENITY_SOURCE_DIR=${SERENITY_SOURCE_DIR}" ) + if (APPLE) + set_tests_properties(LibWeb WPT PROPERTIES + ENVIRONMENT "WEBDRIVER_BINARY=$/$" + ) + endif() endif() diff --git a/Tests/LibWeb/WPT/run.sh b/Tests/LibWeb/WPT/run.sh index a01eb4e377..c2e8377e37 100755 --- a/Tests/LibWeb/WPT/run.sh +++ b/Tests/LibWeb/WPT/run.sh @@ -11,8 +11,8 @@ then fi -WEBDRIVER_BINARY=$(env PATH="${SERENITY_SOURCE_DIR}/Build/lagom/bin:${SERENITY_SOURCE_DIR}/Meta/Lagom/Build/bin:${PATH}" \ - which WebDriver) +: "${WEBDRIVER_BINARY:=$(env PATH="${SERENITY_SOURCE_DIR}/Build/lagom/bin:${SERENITY_SOURCE_DIR}/Meta/Lagom/Build/bin:${PATH}" \ + which WebDriver)}" update_expectations_metadata=false for arg in "$@"; do