From b2d2bb43cea4cde8e468cdaf852e7040f7ac3075 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Fri, 2 Sep 2022 12:59:34 -0400 Subject: [PATCH] LibLocale: Move locale test files to the LibLocale folder --- Meta/Lagom/CMakeLists.txt | 3 ++- Tests/CMakeLists.txt | 1 + Tests/LibLocale/CMakeLists.txt | 11 +++++++++++ .../TestDateTimeFormat.cpp} | 0 .../TestLocale.cpp} | 0 Tests/LibUnicode/CMakeLists.txt | 2 -- 6 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 Tests/LibLocale/CMakeLists.txt rename Tests/{LibUnicode/TestUnicodeDateTimeFormat.cpp => LibLocale/TestDateTimeFormat.cpp} (100%) rename Tests/{LibUnicode/TestUnicodeLocale.cpp => LibLocale/TestLocale.cpp} (100%) diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index d330d55ac57..1581a15f5ae 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -727,7 +727,8 @@ if (BUILD_LAGOM) # Unicode file(GLOB LIBUNICODE_TEST_SOURCES CONFIGURE_DEPENDS "../../Tests/LibUnicode/*.cpp") - foreach(source ${LIBUNICODE_TEST_SOURCES}) + file(GLOB LIBLOCALE_TEST_SOURCES CONFIGURE_DEPENDS "../../Tests/LibLocale/*.cpp") + foreach(source ${LIBUNICODE_TEST_SOURCES} ${LIBLOCALE_TEST_SOURCES}) lagom_test(${source} LIBS LibUnicode) endforeach() diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 92d6ea160f4..03829c78d3d 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -11,6 +11,7 @@ add_subdirectory(LibGfx) add_subdirectory(LibGL) add_subdirectory(LibIMAP) add_subdirectory(LibJS) +add_subdirectory(LibLocale) add_subdirectory(LibM) add_subdirectory(LibMarkdown) add_subdirectory(LibPDF) diff --git a/Tests/LibLocale/CMakeLists.txt b/Tests/LibLocale/CMakeLists.txt new file mode 100644 index 00000000000..0f0f2e1bea4 --- /dev/null +++ b/Tests/LibLocale/CMakeLists.txt @@ -0,0 +1,11 @@ +set(TEST_SOURCES + TestDateTimeFormat.cpp + TestLocale.cpp +) + +foreach(source IN LISTS TEST_SOURCES) + serenity_test("${source}" LibLocale LIBS LibUnicode) + + get_filename_component(target "${source}" NAME_WLE) + link_with_locale_data("${target}") +endforeach() diff --git a/Tests/LibUnicode/TestUnicodeDateTimeFormat.cpp b/Tests/LibLocale/TestDateTimeFormat.cpp similarity index 100% rename from Tests/LibUnicode/TestUnicodeDateTimeFormat.cpp rename to Tests/LibLocale/TestDateTimeFormat.cpp diff --git a/Tests/LibUnicode/TestUnicodeLocale.cpp b/Tests/LibLocale/TestLocale.cpp similarity index 100% rename from Tests/LibUnicode/TestUnicodeLocale.cpp rename to Tests/LibLocale/TestLocale.cpp diff --git a/Tests/LibUnicode/CMakeLists.txt b/Tests/LibUnicode/CMakeLists.txt index 3e056c59947..5443ea60a5e 100644 --- a/Tests/LibUnicode/CMakeLists.txt +++ b/Tests/LibUnicode/CMakeLists.txt @@ -1,7 +1,5 @@ set(TEST_SOURCES TestUnicodeCharacterTypes.cpp - TestUnicodeDateTimeFormat.cpp - TestUnicodeLocale.cpp ) foreach(source IN LISTS TEST_SOURCES)