From 0687a75eaaf7b639133283b19711d80222647b1b Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Mon, 9 Jan 2023 22:29:39 +0100 Subject: [PATCH] LibWeb: Run tests in lagom if ENABLE_LAGOM_LIBWEB is set --- Meta/Lagom/CMakeLists.txt | 10 ++++++++++ Tests/LibWeb/TestHTMLTokenizer.cpp | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 50b3ee35fb..a143b030c1 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -662,6 +662,16 @@ if (BUILD_LAGOM) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../Tests/LibVideo) endforeach() + # Web + if (ENABLE_LAGOM_LIBWEB) + file(COPY "${SERENITY_PROJECT_ROOT}/Tests/LibWeb/tokenizer-test.html" DESTINATION "./") + file(GLOB LIBWEB_TEST_SOURCES CONFIGURE_DEPENDS "../../Tests/LibWeb/*.cpp") + foreach(source ${LIBWEB_TEST_SOURCES}) + lagom_test(${source} LIBS LibWeb + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../Tests/LibWeb) + endforeach() + endif() + # JavaScriptTestRunner + LibTest tests # test-js add_executable(test-js diff --git a/Tests/LibWeb/TestHTMLTokenizer.cpp b/Tests/LibWeb/TestHTMLTokenizer.cpp index 385fc690c2..977fd926bf 100644 --- a/Tests/LibWeb/TestHTMLTokenizer.cpp +++ b/Tests/LibWeb/TestHTMLTokenizer.cpp @@ -201,7 +201,14 @@ TEST_CASE(doctype) // If that changes, or something is added to the test HTML, the hash needs to be adjusted. TEST_CASE(regression) { - auto file = MUST(Core::Stream::File::open("/usr/Tests/LibWeb/tokenizer-test.html"sv, Core::Stream::OpenMode::Read)); + // This makes sure that the tests will run both on target and in Lagom. +#ifdef AK_OS_SERENITY + StringView path = "/usr/Tests/LibWeb/tokenizer-test.html"sv; +#else + StringView path = "tokenizer-test.html"sv; +#endif + + auto file = MUST(Core::Stream::File::open(path, Core::Stream::OpenMode::Read)); auto file_size = MUST(file->size()); auto content = MUST(ByteBuffer::create_uninitialized(file_size)); MUST(file->read(content.bytes()));