diff --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake --- a/libc/cmake/modules/LLVMLibCTestRules.cmake +++ b/libc/cmake/modules/LLVMLibCTestRules.cmake @@ -179,7 +179,7 @@ ) # LibcUnitTest should not depend on anything in LINK_LIBRARIES. - list(APPEND link_libraries LibcUnitTestMain LibcUnitTest) + list(APPEND link_libraries LibcUnitTest) target_link_libraries(${fq_build_target_name} PRIVATE ${link_libraries}) @@ -669,7 +669,7 @@ PRIVATE ${HERMETIC_TEST_LINK_LIBRARIES} libc.startup.${LIBC_TARGET_OS}.crt1 - LibcHermeticTestMain LibcHermeticTest + LibcHermeticTest # The NVIDIA 'nvlink' linker does not currently support static libraries. $<$>:${fq_target_name}.__libc__>) add_dependencies(${fq_build_target_name} diff --git a/libc/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt --- a/libc/test/UnitTest/CMakeLists.txt +++ b/libc/test/UnitTest/CMakeLists.txt @@ -1,9 +1,10 @@ set(libc_test_srcs_common - Test.h - LibcTest.cpp CmakeFilePath.cpp - LibcTest.h + LibcTest.cpp + LibcTestMain.cpp TestLogger.cpp + LibcTest.h + Test.h TestLogger.h ) @@ -36,23 +37,7 @@ HermeticTestUtils.cpp ) -add_library( - LibcUnitTestMain - ${library_type} - EXCLUDE_FROM_ALL - LibcTestMain.cpp -) -add_dependencies(LibcUnitTestMain LibcUnitTest) - -add_library( - LibcHermeticTestMain - ${library_type} - EXCLUDE_FROM_ALL - LibcTestMain.cpp -) -add_dependencies(LibcHermeticTestMain LibcHermeticTest) - -foreach(lib LibcUnitTest LibcUnitTestMain LibcHermeticTest LibcHermeticTestMain) +foreach(lib LibcUnitTest LibcHermeticTest) target_include_directories(${lib} PUBLIC ${LIBC_SOURCE_DIR}) target_compile_options(${lib} PRIVATE -fno-exceptions -fno-rtti) add_dependencies(${lib} @@ -65,11 +50,9 @@ ) endforeach() -foreach(lib LibcHermeticTest LibcHermeticTestMain) - target_include_directories(${lib} PRIVATE ${LIBC_BUILD_DIR}/include) - target_compile_options(${lib} - PRIVATE ${LIBC_HERMETIC_TEST_COMPILE_OPTIONS} -ffreestanding -nostdlib -nostdlib++) -endforeach() +target_include_directories(LibcHermeticTest PRIVATE ${LIBC_BUILD_DIR}/include) +target_compile_options(LibcHermeticTest + PRIVATE ${LIBC_HERMETIC_TEST_COMPILE_OPTIONS} -ffreestanding -nostdlib -nostdlib++) add_header_library( string_utils