[libc] Remove startup option from integration tests

[jhuber6]

Summary

This generalizes handling of the integration tests. We now implicitly
depend on the libc.startup.${LIBC_TARGET_OS}.crt1 file rather than
passing it in manually. This simplifies the interface.

libc/cmake/modules/LLVMLibCTestRules.cmake

 # the object files of the DEPENDS targets.
 # 
 # Usage:
 #   add_integration_test(
 #     <target name>
 #     SUITE <the suite to which the test should belong>
 #     SRCS <src1.cpp> [src2.cpp ...]
 #     HDRS [hdr1.cpp ...]
-#     STARTUP <fully qualified startup system target name>
 #     DEPENDS <list of entrypoint or other object targets>
 #     ARGS <list of command line arguments to be passed to the test>
 #     ENV <list of environment variables to set before running the test>
 #     COMPILE_OPTIONS <list of special compile options for this target>
 #   )
 #
 # The DEPENDS list can be empty. If not empty, it should be a list of
 # targets added with add_entrypoint_object or add_object_library.
 function(add_integration_test test_name)
   get_fq_target_name(${test_name} fq_target_name)
   if(NOT (${LIBC_TARGET_OS} STREQUAL "linux"))
     message(STATUS "Skipping ${fq_target_name} as it is not available on ${LIBC_TARGET_OS}.")
     return()
   endif()
   cmake_parse_arguments(
     "INTEGRATION_TEST"
     "" # No optional arguments
-    "SUITE;STARTUP" # Single value arguments
+    "SUITE" # Single value arguments
     "SRCS;HDRS;DEPENDS;ARGS;ENV;COMPILE_OPTIONS" # Multi-value arguments
     ${ARGN}
   )
 
   if(NOT INTEGRATION_TEST_SUITE)
     message(FATAL_ERROR "SUITE not specified for ${fq_target_name}")
   endif()
-  if(NOT INTEGRATION_TEST_STARTUP)
-    message(FATAL_ERROR "The STARTUP to link to the integration test is missing.")
-  endif()
   if(NOT INTEGRATION_TEST_SRCS)
     message(FATAL_ERROR "The SRCS list for add_integration_test is missing.")
   endif()
+  if(NOT TARGET libc.startup.${LIBC_TARGET_OS}.crt1)
+    message(FATAL_ERROR "The 'crt1' target for the integration test is missing.")
+  endif()
 
   get_fq_target_name(${test_name}.libc fq_libc_target_name)
 
   get_fq_deps_list(fq_deps_list ${INTEGRATION_TEST_DEPENDS})
   list(APPEND fq_deps_list
-      # All integration tests need to inherit the same dependencies as the
-      # startup code.
-      ${INTEGRATION_TEST_STARTUP}
+      # All integration tests use the operating system's startup object and need
+      # to inherit the same dependencies.
+      libc.startup.${LIBC_TARGET_OS}.crt1
       # We always add the memory functions objects. This is because the
       # compiler's codegen can emit calls to the C memory functions.
       libc.src.string.bcmp
       libc.src.string.bzero
       libc.src.string.memcmp
       libc.src.string.memcpy
       libc.src.string.memmove
       libc.src.string.memset

libc/test/integration/src/__support/threads/CMakeLists.txt

 if(NOT (TARGET libc.src.__support.threads.thread AND
         TARGET libc.src.__support.threads.mutex))
   return()
 endif()
 
 add_libc_integration_test_suite(libc-support-threads-integration-tests)
 
 add_integration_test(
   thread_detach_test
   SUITE
     libc-support-threads-integration-tests
   SRCS
     thread_detach_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.src.__support.threads.mutex
     libc.src.__support.threads.thread
 )
 
 add_integration_test(
   thread_tls_test
   SUITE
     libc-support-threads-integration-tests
   SRCS
     thread_tls_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.src.__support.threads.thread
 )

libc/test/integration/src/pthread/CMakeLists.txt

 add_libc_integration_test_suite(libc-pthread-integration-tests)
 
 add_integration_test(
   pthread_mutex_test
   SUITE
     libc-pthread-integration-tests
   SRCS
     pthread_mutex_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.pthread
     libc.src.errno.errno
     libc.src.pthread.pthread_mutex_destroy
     libc.src.pthread.pthread_mutex_init
     libc.src.pthread.pthread_mutex_lock
     libc.src.pthread.pthread_mutex_unlock
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_join
 )
 
 add_integration_test(
   pthread_test
   SUITE
     libc-pthread-integration-tests
   SRCS
     pthread_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.pthread
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_join
 )
 
 add_integration_test(
   pthread_equal_test
   SUITE
     libc-pthread-integration-tests
   SRCS
     pthread_equal_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.pthread
     libc.src.errno.errno
     libc.src.pthread.pthread_mutex_destroy
     libc.src.pthread.pthread_mutex_init
     libc.src.pthread.pthread_mutex_lock
     libc.src.pthread.pthread_mutex_unlock
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_equal
     libc.src.pthread.pthread_join
     libc.src.pthread.pthread_self
 )
 
 add_integration_test(
   pthread_name_test
   SUITE
     libc-pthread-integration-tests
   SRCS
     pthread_name_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.errno
     libc.include.pthread
     libc.src.errno.errno
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_getname_np
     libc.src.pthread.pthread_join
     libc.src.pthread.pthread_mutex_destroy
     libc.src.pthread.pthread_mutex_init
     libc.src.pthread.pthread_mutex_lock
     libc.src.pthread.pthread_mutex_unlock
     libc.src.pthread.pthread_self
     libc.src.pthread.pthread_setname_np
 )
 
 add_integration_test(
   pthread_exit_test
   SUITE
     libc-pthread-integration-tests
   SRCS
     pthread_exit_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.pthread
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_exit
     libc.src.pthread.pthread_join
 )
 
 add_integration_test(
   pthread_tss_test
   SUITE
     libc-pthread-integration-tests
   SRCS
     pthread_tss_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.pthread
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_exit
     libc.src.pthread.pthread_join
     libc.src.pthread.pthread_key_create
     libc.src.pthread.pthread_key_delete
     libc.src.pthread.pthread_getspecific
     libc.src.pthread.pthread_setspecific
 )
 
 add_integration_test(
   pthread_once_test
   SUITE
     libc-pthread-integration-tests
   SRCS
     pthread_once_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.pthread
     libc.src.pthread.pthread_once
     libc.src.pthread.pthread_mutex_destroy
     libc.src.pthread.pthread_mutex_init
     libc.src.pthread.pthread_mutex_lock
     libc.src.pthread.pthread_mutex_unlock
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_join
     libc.src.__support.CPP.atomic
 )

libc/test/integration/src/spawn/CMakeLists.txt

 )
 
 add_integration_test(
   posix_spawn_test
   SUITE
     spawn-integration-tests
   SRCS
     posix_spawn_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc_posix_spawn_test_binary
     libc.test.integration.src.spawn.test_binary_properties
     libc.include.fcntl
     libc.include.signal
     libc.include.spawn
     libc.include.sys_wait
     libc.src.signal.raise
     libc.src.spawn.posix_spawn
     libc.src.spawn.posix_spawn_file_actions_addopen
     libc.src.spawn.posix_spawn_file_actions_destroy
     libc.src.spawn.posix_spawn_file_actions_init
     libc.src.sys.wait.waitpid
 )
 
 add_subdirectory(testdata)

libc/test/integration/src/stdio/CMakeLists.txt

 add_custom_target(stdio-integration-tests)
 add_dependencies(libc-integration-tests stdio-integration-tests)
 
 # These tests are not for correctness testing, but are instead a convenient way
 # to generate hermetic binaries for comparitive binary size testing.
 add_integration_test(
   sprintf_size_test
   SUITE
     stdio-integration-tests
   SRCS
     sprintf_size_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.src.stdio.sprintf
   ARGS
     "%s %c %d"
     "First arg"
     "a"
     "0"
 )
 
 add_integration_test(
   sprintf_size_test_no_sprintf
   SUITE
     stdio-integration-tests
   SRCS
     sprintf_size_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   ARGS
     "%s %c %d"
     "First arg"
     "a"
     "0"
   COMPILE_OPTIONS
     -DINTEGRATION_DISABLE_PRINTF
 )
 

libc/test/integration/src/stdlib/CMakeLists.txt

 add_custom_target(stdlib-integration-tests)
 add_dependencies(libc-integration-tests stdlib-integration-tests)
 
 add_integration_test(
   getenv_test
   SUITE
     stdlib-integration-tests
   SRCS
     getenv_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.src.stdlib.getenv
   ENV
     FRANCE=Paris
     GERMANY=Berlin
 )
 

libc/test/integration/src/threads/CMakeLists.txt

 add_libc_integration_test_suite(libc-threads-integration-tests)
 
 add_integration_test(
   mtx_test
   SUITE
     libc-threads-integration-tests
   SRCS
     mtx_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.threads
     libc.src.errno.errno
     libc.src.threads.mtx_destroy
     libc.src.threads.mtx_init
     libc.src.threads.mtx_lock
     libc.src.threads.mtx_unlock
     libc.src.threads.thrd_create
     libc.src.threads.thrd_join
 )
 
 add_integration_test(
   thrd_equal_test
   SUITE
     libc-threads-integration-tests
   SRCS
     thrd_equal_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.threads
     libc.src.threads.mtx_destroy
     libc.src.threads.mtx_init
     libc.src.threads.mtx_lock
     libc.src.threads.mtx_unlock
     libc.src.threads.thrd_create
     libc.src.threads.thrd_current
     libc.src.threads.thrd_equal
     libc.src.threads.thrd_join
 )
 
 add_integration_test(
   thrd_test
   SUITE
     libc-threads-integration-tests
   SRCS
     thrd_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.threads
     libc.src.errno.errno
     libc.src.threads.thrd_create
     libc.src.threads.thrd_join
 )
 
 add_integration_test(
   thrd_exit_test
   SUITE
     libc-threads-integration-tests
   SRCS
     thrd_exit_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.threads
     libc.src.threads.thrd_create
     libc.src.threads.thrd_exit
     libc.src.threads.thrd_join
 )
 
 add_integration_test(
   tss_test
   SUITE
     libc-threads-integration-tests
   SRCS
     tss_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.threads
     libc.src.threads.thrd_create
     libc.src.threads.thrd_exit
     libc.src.threads.thrd_join
     libc.src.threads.tss_create
     libc.src.threads.tss_delete
     libc.src.threads.tss_get
     libc.src.threads.tss_set
 )
 
 add_integration_test(
   call_once_test
   SUITE
     libc-threads-integration-tests
   SRCS
     call_once_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.threads
     libc.src.threads.call_once
     libc.src.threads.mtx_destroy
     libc.src.threads.mtx_init
     libc.src.threads.mtx_lock
     libc.src.threads.mtx_unlock
     libc.src.threads.thrd_create
     libc.src.threads.thrd_join
     libc.src.__support.CPP.atomic
 )
 
 add_integration_test(
   cnd_test
   SUITE
     libc-threads-integration-tests
   SRCS
     cnd_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.threads
     libc.src.threads.cnd_init
     libc.src.threads.cnd_broadcast
     libc.src.threads.cnd_signal
     libc.src.threads.cnd_destroy
     libc.src.threads.cnd_wait
     libc.src.threads.mtx_destroy
     libc.src.threads.mtx_init
     libc.src.threads.mtx_lock
     libc.src.threads.mtx_unlock
     libc.src.threads.thrd_create
     libc.src.threads.thrd_join
     libc.src.threads.linux.threads_utils
 )

libc/test/integration/src/unistd/CMakeLists.txt

 add_custom_target(unistd-integration-tests)
 add_dependencies(libc-integration-tests unistd-integration-tests)
 
 add_integration_test(
   getcwd_test
   SUITE
     unistd-integration-tests
   SRCS
     getcwd_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.src.__support.CPP.string_view
     libc.src.errno.errno
     libc.src.stdlib.getenv
     libc.src.unistd.getcwd
 )
 
 add_integration_test(
   fork_test
   SUITE
     unistd-integration-tests
   SRCS
     fork_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc.include.errno
     libc.include.signal
     libc.include.sys_wait
     libc.include.unistd
     libc.src.pthread.pthread_atfork
     libc.src.signal.raise
     libc.src.sys.wait.wait

 )
 
 add_integration_test(
   execv_test
   SUITE
     unistd-integration-tests
   SRCS
     execv_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc_execv_test_normal_exit
     libc_execv_test_signal_exit
     libc.include.errno
     libc.src.sys.wait.waitpid
     libc.src.unistd.execv
     libc.src.unistd.fork
   ENV
     EXECV_TEST=PASS
 )
 
 add_integration_test(
   execve_test
   SUITE
     unistd-integration-tests
   SRCS
     execve_test.cpp
-  STARTUP
-    libc.startup.linux.crt1
   DEPENDS
     libc_execv_test_normal_exit
     libc_execv_test_signal_exit
     libc.include.errno
     libc.src.sys.wait.waitpid
     libc.src.unistd.execve
     libc.src.unistd.fork
   ENV
     EXECV_TEST=PASS
 )

libc/test/integration/startup/linux/CMakeLists.txt

 if(NOT (EXISTS ${LIBC_SOURCE_DIR}/startup/linux/${LIBC_TARGET_ARCHITECTURE}))
   message("Skipping startup integration tests for target architecture ${LIBC_TARGET_ARCHITECTURE}.")
   return()
 endif()
 
 add_custom_target(libc-startup-tests)
 add_dependencies(libc-integration-tests libc-startup-tests)
 
 add_integration_test(
   startup_args_test
   SUITE libc-startup-tests
-  STARTUP
-    libc.startup.linux.crt1
   SRCS
     args_test.cpp
   ARGS
     1 2 3
   ENV
     FRANCE=Paris
     GERMANY=Berlin
 )
 
 add_integration_test(
   startup_no_envp_test
   SUITE libc-startup-tests
-  STARTUP
-    libc.startup.linux.crt1
   SRCS
     main_without_envp.cpp
 )
 
 add_integration_test(
   startup_no_args_test
   SUITE libc-startup-tests
-  STARTUP
-    libc.startup.linux.crt1
   SRCS
     main_without_args.cpp
 )
 
 add_integration_test(
   startup_tls_test
   SUITE libc-startup-tests
-  STARTUP
-    libc.startup.linux.crt1
   SRCS
     tls_test.cpp
   DEPENDS
     libc.include.errno
     libc.include.sys_mman
     libc.src.errno.errno
     libc.src.sys.mman.mmap
 )
 
 add_integration_test(
   init_fini_array_test
   SUITE libc-startup-tests
-  STARTUP
-    libc.startup.linux.crt1
   SRCS
     init_fini_array_test.cpp
 )