diff options
| author | Andrew Kaster <akaster@serenityos.org> | 2023-03-10 10:45:50 -0700 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2023-03-10 23:01:55 +0000 |
| commit | 3d33217d6075f04c714e197a27865b38e381aad2 (patch) | |
| tree | 4de4aff129fd2183d3e8c33bc5136279ba0b9336 | |
| parent | af58f012be3ad64fc4fd0754b4894a8b5278c0ad (diff) | |
| download | serenity-3d33217d6075f04c714e197a27865b38e381aad2.zip | |
Ladybird+CI: Move layout_test.sh test runner from CI yml into CMake
We should be able to run this locally, as long as ENABLE_LAGOM_LADYBIRD
is true, or if building ladybird from the ladybird source directory.
This removes a special case from the Lagom CI yml file.
| -rw-r--r-- | Ladybird/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Meta/Azure/Lagom.yml | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index bdff1b7a9d..1b06ecf5b8 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -137,3 +137,12 @@ add_dependencies(ladybird SQLServer WebContent WebDriver) if(NOT CMAKE_SKIP_INSTALL_RULES) include(cmake/InstallRules.cmake) endif() + +include(CTest) +if (BUILD_TESTING) + add_test( + NAME Layout + COMMAND ${SERENITY_SOURCE_DIR}/Tests/LibWeb/Layout/layout_test.sh ${CMAKE_CURRENT_BINARY_DIR} + ) + set_tests_properties(Layout PROPERTIES ENVIRONMENT QT_QPA_PLATFORM=offscreen) +endif() diff --git a/Meta/Azure/Lagom.yml b/Meta/Azure/Lagom.yml index f903c7ebff..677c618f8c 100644 --- a/Meta/Azure/Lagom.yml +++ b/Meta/Azure/Lagom.yml @@ -145,16 +145,6 @@ jobs: ASAN_OPTIONS: 'strict_string_checks=1:check_initialization_order=1:strict_init_order=1' UBSAN_OPTIONS: 'print_stacktrace=1:print_summary=1:halt_on_error=1' - - script: | - $(Build.SourcesDirectory)/Tests/LibWeb/Layout/layout_test.sh "$(Build.SourcesDirectory)/Meta/Lagom/Build/Ladybird" - displayName: 'LibWeb Layout Tests' - env: - SERENITY_SOURCE_DIR: '$(Build.SourcesDirectory)' - QT_QPA_PLATFORM: 'offscreen' - # FIXME: enable detect_stack_use_after_return=1 #7420 - ASAN_OPTIONS: 'strict_string_checks=1:check_initialization_order=1:strict_init_order=1' - UBSAN_OPTIONS: 'print_stacktrace=1:print_summary=1:halt_on_error=1' - - ${{ if eq(parameters.lagom_lints, true) }}: - script: | set -e |