From 8ae3191ab5156b4a0a3eb457aeca0f52a7a308e0 Mon Sep 17 00:00:00 2001
From: Brian Gianforcaro <bgianf@serenityos.org>
Date: Wed, 28 Apr 2021 19:05:23 -0700
Subject: [PATCH] Tests: Unify LibC tests to single location.

In a1720eed2a8e744f2cd6d99adae4dff1fbab309e I added this new test,
but missed that there were already some "unit tests" for LibC over
in Userland/Tests/LibC. So lets unify these two locations.
---
 Userland/DynamicLoader/CMakeLists.txt              |  2 --
 Userland/Libraries/LibC/CMakeLists.txt             |  2 --
 Userland/Libraries/LibC/Tests/CMakeLists.txt       |  5 -----
 Userland/Tests/LibC/CMakeLists.txt                 | 14 ++++++++++----
 .../LibC/Tests => Tests/LibC}/TestLibCTime.cpp     |  0
 5 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 Userland/Libraries/LibC/Tests/CMakeLists.txt
 rename Userland/{Libraries/LibC/Tests => Tests/LibC}/TestLibCTime.cpp (100%)

diff --git a/Userland/DynamicLoader/CMakeLists.txt b/Userland/DynamicLoader/CMakeLists.txt
index e4ff20970b..3ce9836039 100644
--- a/Userland/DynamicLoader/CMakeLists.txt
+++ b/Userland/DynamicLoader/CMakeLists.txt
@@ -8,8 +8,6 @@ file(GLOB AK_SOURCES "../../AK/*.cpp")
 file(GLOB ELF_SOURCES "../Libraries/LibELF/*.cpp")
 file(GLOB LIBC_SOURCES1 "../Libraries/LibC/*.cpp")
 file(GLOB LIBC_SOURCES2 "../Libraries/LibC/*/*.cpp")
-file(GLOB LIBC_TEST_SOURCES "../Libraries/LibC/Tests/*.cpp")
-list(REMOVE_ITEM LIBC_SOURCES2 ${LIBC_TEST_SOURCES})
 
 if ("${SERENITY_ARCH}" STREQUAL "i686")
     file(GLOB LIBC_SOURCES3 "../Libraries/LibC/arch/i386/*.S")
diff --git a/Userland/Libraries/LibC/CMakeLists.txt b/Userland/Libraries/LibC/CMakeLists.txt
index 1ef945d3fe..f2d90963db 100644
--- a/Userland/Libraries/LibC/CMakeLists.txt
+++ b/Userland/Libraries/LibC/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory(Tests)
-
 set(LIBC_SOURCES
     arpa/inet.cpp
     assert.cpp
diff --git a/Userland/Libraries/LibC/Tests/CMakeLists.txt b/Userland/Libraries/LibC/Tests/CMakeLists.txt
deleted file mode 100644
index 5dff11b9a3..0000000000
--- a/Userland/Libraries/LibC/Tests/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-file(GLOB TEST_SOURCES CONFIGURE_DEPENDS "*.cpp")
-
-foreach(source ${TEST_SOURCES})
-    serenity_test(${source} LibC)
-endforeach()
diff --git a/Userland/Tests/LibC/CMakeLists.txt b/Userland/Tests/LibC/CMakeLists.txt
index a42c42b47e..45cbf3f5d8 100644
--- a/Userland/Tests/LibC/CMakeLists.txt
+++ b/Userland/Tests/LibC/CMakeLists.txt
@@ -1,6 +1,11 @@
+set(TEST_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/snprintf-correctness.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/strlcpy-correctness.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/TestLibCTime.cpp
+)
+
 file(GLOB CMD_SOURCES  CONFIGURE_DEPENDS "*.cpp")
-list(REMOVE_ITEM CMD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/snprintf-correctness.cpp)
-list(REMOVE_ITEM CMD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/strlcpy-correctness.cpp)
+list(REMOVE_ITEM CMD_SOURCES ${TEST_SOURCES})
 
 # FIXME: These tests do not use LibTest
 foreach(CMD_SRC ${CMD_SOURCES})
@@ -10,5 +15,6 @@ foreach(CMD_SRC ${CMD_SOURCES})
     install(TARGETS ${CMD_NAME} RUNTIME DESTINATION usr/Tests/LibC)
 endforeach()
 
-serenity_test(snprintf-correctness.cpp LibC)
-serenity_test(strlcpy-correctness.cpp LibC)
+foreach(source ${TEST_SOURCES})
+    serenity_test(${source} LibC)
+endforeach()
diff --git a/Userland/Libraries/LibC/Tests/TestLibCTime.cpp b/Userland/Tests/LibC/TestLibCTime.cpp
similarity index 100%
rename from Userland/Libraries/LibC/Tests/TestLibCTime.cpp
rename to Userland/Tests/LibC/TestLibCTime.cpp