[libc] Remove *TestMain libraries and combine them with the main test libraries.

There are not tests currently which use the main test framework but not
the `main` function from LibcTestMain.cpp. So, this change essentially
simplifies by merging the *TestMain libraries with the main test
libraries.

Reviewed By: michaelrj, jhuber6

Differential Revision: https://reviews.llvm.org/D150698

diff --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake
index 4458c00..820c21f 100644 (file)
--- a/libc/cmake/modules/LLVMLibCTestRules.cmake
+++ b/libc/cmake/modules/LLVMLibCTestRules.cmake
@@ -179,7 +179,7 @@ function(create_libc_unittest fq_target_name)
   )
 
   # 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 @@ function(add_libc_hermetic_test test_name)
     PRIVATE
       ${HERMETIC_TEST_LINK_LIBRARIES}
       libc.startup.${LIBC_TARGET_OS}.crt1
-      LibcHermeticTestMain LibcHermeticTest
+      LibcHermeticTest
       # The NVIDIA 'nvlink' linker does not currently support static libraries.
       $<$<NOT:$<BOOL:${LIBC_GPU_TARGET_ARCHITECTURE_IS_NVPTX}>>:${fq_target_name}.__libc__>)
   add_dependencies(${fq_build_target_name}

diff --git a/libc/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt
index 7a54d50..7f6e782 100644 (file)
--- 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 @@ add_library(
   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 @@ foreach(lib LibcUnitTest LibcUnitTestMain LibcHermeticTest LibcHermeticTestMain)
   )
 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