mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 07:07:34 +00:00
Tests: Unify LibC tests to single location.
In a1720eed2a
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.
This commit is contained in:
parent
7a0d7525f1
commit
8ae3191ab5
5 changed files with 10 additions and 13 deletions
|
@ -8,8 +8,6 @@ file(GLOB AK_SOURCES "../../AK/*.cpp")
|
||||||
file(GLOB ELF_SOURCES "../Libraries/LibELF/*.cpp")
|
file(GLOB ELF_SOURCES "../Libraries/LibELF/*.cpp")
|
||||||
file(GLOB LIBC_SOURCES1 "../Libraries/LibC/*.cpp")
|
file(GLOB LIBC_SOURCES1 "../Libraries/LibC/*.cpp")
|
||||||
file(GLOB LIBC_SOURCES2 "../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")
|
if ("${SERENITY_ARCH}" STREQUAL "i686")
|
||||||
file(GLOB LIBC_SOURCES3 "../Libraries/LibC/arch/i386/*.S")
|
file(GLOB LIBC_SOURCES3 "../Libraries/LibC/arch/i386/*.S")
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
add_subdirectory(Tests)
|
|
||||||
|
|
||||||
set(LIBC_SOURCES
|
set(LIBC_SOURCES
|
||||||
arpa/inet.cpp
|
arpa/inet.cpp
|
||||||
assert.cpp
|
assert.cpp
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
file(GLOB TEST_SOURCES CONFIGURE_DEPENDS "*.cpp")
|
|
||||||
|
|
||||||
foreach(source ${TEST_SOURCES})
|
|
||||||
serenity_test(${source} LibC)
|
|
||||||
endforeach()
|
|
|
@ -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")
|
file(GLOB CMD_SOURCES CONFIGURE_DEPENDS "*.cpp")
|
||||||
list(REMOVE_ITEM CMD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/snprintf-correctness.cpp)
|
list(REMOVE_ITEM CMD_SOURCES ${TEST_SOURCES})
|
||||||
list(REMOVE_ITEM CMD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/strlcpy-correctness.cpp)
|
|
||||||
|
|
||||||
# FIXME: These tests do not use LibTest
|
# FIXME: These tests do not use LibTest
|
||||||
foreach(CMD_SRC ${CMD_SOURCES})
|
foreach(CMD_SRC ${CMD_SOURCES})
|
||||||
|
@ -10,5 +15,6 @@ foreach(CMD_SRC ${CMD_SOURCES})
|
||||||
install(TARGETS ${CMD_NAME} RUNTIME DESTINATION usr/Tests/LibC)
|
install(TARGETS ${CMD_NAME} RUNTIME DESTINATION usr/Tests/LibC)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
serenity_test(snprintf-correctness.cpp LibC)
|
foreach(source ${TEST_SOURCES})
|
||||||
serenity_test(strlcpy-correctness.cpp LibC)
|
serenity_test(${source} LibC)
|
||||||
|
endforeach()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue