From ffb3ba3079ee5f0612f9bd95a4d41189bce4565d Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Tue, 4 Jan 2022 10:52:19 -0500 Subject: [PATCH] Tests: Link some tests directly against LibUnicodeData These were missed in 565a880ce5a14bac817c73916e91ebfa04c8b99b. This wasn't an issue because these tests don't pledge/unveil anything, so they could happily dlopen() the library at runtime. But this is now needed in order to migrate LibUnicode towards weak symbols instead. --- Tests/LibJS/CMakeLists.txt | 2 ++ Tests/LibRegex/CMakeLists.txt | 2 ++ Tests/LibUnicode/CMakeLists.txt | 3 +++ 3 files changed, 7 insertions(+) diff --git a/Tests/LibJS/CMakeLists.txt b/Tests/LibJS/CMakeLists.txt index b800d6ca21..210440c6f6 100644 --- a/Tests/LibJS/CMakeLists.txt +++ b/Tests/LibJS/CMakeLists.txt @@ -1,5 +1,7 @@ serenity_testjs_test(test-js.cpp test-js) install(TARGETS test-js RUNTIME DESTINATION bin OPTIONAL) +link_with_unicode_data(test-js) serenity_test(test-invalid-unicode-js.cpp LibJS LIBS LibJS) +link_with_unicode_data(test-invalid-unicode-js) diff --git a/Tests/LibRegex/CMakeLists.txt b/Tests/LibRegex/CMakeLists.txt index eeeacecfba..d632992976 100644 --- a/Tests/LibRegex/CMakeLists.txt +++ b/Tests/LibRegex/CMakeLists.txt @@ -7,3 +7,5 @@ set(TEST_SOURCES foreach(source IN LISTS TEST_SOURCES) serenity_test("${source}" LibRegex LIBS LibRegex) endforeach() + +link_with_unicode_data(Regex) diff --git a/Tests/LibUnicode/CMakeLists.txt b/Tests/LibUnicode/CMakeLists.txt index e79b48be92..416993bb5c 100644 --- a/Tests/LibUnicode/CMakeLists.txt +++ b/Tests/LibUnicode/CMakeLists.txt @@ -5,4 +5,7 @@ set(TEST_SOURCES foreach(source IN LISTS TEST_SOURCES) serenity_test("${source}" LibUnicode LIBS LibUnicode) + + get_filename_component(target "${source}" NAME_WLE) + link_with_unicode_data("${target}") endforeach()