diff options
author | Brian Gianforcaro <bgianf@serenityos.org> | 2021-05-07 04:02:12 -0700 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2021-05-08 00:04:10 +0100 |
commit | 7e28ecc305172873bf3f4e564caee7e6ccba3cbf (patch) | |
tree | 0e147a99fa89de3172533bca2660cfea1d988f87 /Meta | |
parent | 1162e71a5c7f607fd027f8e095f68f083ac3fcf5 (diff) | |
download | serenity-7e28ecc305172873bf3f4e564caee7e6ccba3cbf.zip |
Meta + Lagom: Fix paths after movement of tests to Tests/
Not sure how this didn't cause a build break when I originally
moved them in #6891. Better fix them now.
Diffstat (limited to 'Meta')
-rw-r--r-- | Meta/Lagom/CMakeLists.txt | 10 | ||||
-rwxr-xr-x | Meta/check-ak-test-files.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 80e7648dd2..b350ac3c46 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -43,13 +43,13 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") endif() file(GLOB AK_SOURCES CONFIGURE_DEPENDS "../../AK/*.cpp") -file(GLOB AK_TEST_SOURCES CONFIGURE_DEPENDS "../../AK/Tests/*.cpp") +file(GLOB AK_TEST_SOURCES CONFIGURE_DEPENDS "../../Tests/AK/*.cpp") file(GLOB LIBARCHIVE_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibArchive/*.cpp") file(GLOB LIBAUDIO_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibAudio/*.cpp") list(REMOVE_ITEM LIBAUDIO_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibAudio/ClientConnection.cpp") file(GLOB LIBREGEX_LIBC_SOURCES "../../Userland/Libraries/LibRegex/C/Regex.cpp") file(GLOB LIBREGEX_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibRegex/*.cpp") -file(GLOB LIBREGEX_TESTS CONFIGURE_DEPENDS "../../Userland/Libraries/LibRegex/Tests/*.cpp") +file(GLOB LIBREGEX_TESTS CONFIGURE_DEPENDS "../../Tests/LibRegex/*.cpp") file(GLOB LIBCORE_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCore/*.cpp") file(GLOB LIBELF_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibELF/*.cpp") # There's no way we can reliably make this cross platform @@ -66,7 +66,7 @@ file(GLOB LIBX86_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibX86/*.cp file(GLOB LIBJS_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibJS/*.cpp") file(GLOB LIBJS_SUBDIR_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibJS/*/*.cpp") file(GLOB LIBCOMPRESS_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCompress/*.cpp") -file(GLOB LIBCOMPRESS_TESTS CONFIGURE_DEPENDS "../../Userland/Libraries/LibCompress/Tests/*.cpp") +file(GLOB LIBCOMPRESS_TESTS CONFIGURE_DEPENDS "../../Tests/LibCompress/*.cpp") file(GLOB LIBCRYPTO_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCrypto/*.cpp") file(GLOB LIBCRYPTO_SUBDIR_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCrypto/*/*.cpp") file(GLOB LIBTLS_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibTLS/*.cpp") @@ -76,7 +76,7 @@ file(GLOB SHELL_SOURCES CONFIGURE_DEPENDS "../../Userland/Shell/*.cpp") file(GLOB SHELL_TESTS CONFIGURE_DEPENDS "../../Userland/Shell/Tests/*.sh") list(FILTER SHELL_SOURCES EXCLUDE REGEX ".*main.cpp$") file(GLOB LIBSQL_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibSQL/*.cpp") -file(GLOB LIBSQL_TEST_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibSQL/Tests/*.cpp") +file(GLOB LIBSQL_TEST_SOURCES CONFIGURE_DEPENDS "../../Tests/LibSQL/*.cpp") file(GLOB LIBTEST_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibTest/*.cpp") list(FILTER LIBTEST_SOURCES EXCLUDE REGEX ".*Main.cpp$") @@ -191,7 +191,7 @@ if (BUILD_LAGOM) NAME ${name}_lagom COMMAND ${name}_lagom # FIXME: Only TestJSON needs this property - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../AK/Tests + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../Tests/AK ) endforeach() diff --git a/Meta/check-ak-test-files.sh b/Meta/check-ak-test-files.sh index b9fab96559..f73c05feb2 100755 --- a/Meta/check-ak-test-files.sh +++ b/Meta/check-ak-test-files.sh @@ -10,11 +10,11 @@ MISSING_FILES=n while IFS= read -r FILENAME; do # Simply search whether the CMakeLists.txt *ever* mention the test files. if ! grep -qP "${FILENAME}" AK/Tests/CMakeLists.txt ; then - echo "AK/Tests/CMakeLists.txt is missing the test file ${FILENAME}" + echo "Tests/AK/CMakeLists.txt is missing the test file ${FILENAME}" MISSING_FILES=y fi done < <( - git ls-files 'AK/Tests/Test*.cpp' | xargs -i basename {} + git ls-files 'Test/AK/Test*.cpp' | xargs -i basename {} ) if [ "n" != "${MISSING_FILES}" ] ; then |