Refactor unit tests' CMakeFiles.txt

[aarongreen]

Summary

This change extracts some of the repeated CMake commands into functions, in order to make it easier to add additional unit tests in subsequent changes.

This is change 13 of (at least) 20 for cross-process fuzzing support.

[aarongreen]

Rebase

[aarongreen]

Multiprocess fuzzing will not be supported by the libFuzzer maintainers. Fuchsia has implemented a new approach with their Component Fuzzing Framework (RFC-117).

compiler-rt/lib/fuzzer/CMakeLists.txt

set(LIBFUZZER_HEADERS
   FuzzerInterface.h
   FuzzerInternal.h
   FuzzerLock.h
   FuzzerMerge.h
   FuzzerMonitor.h
   FuzzerMutate.h
   FuzzerOptions.h
   FuzzerRandom.h
+  FuzzerPlatform.h
   FuzzerSHA1.h
   FuzzerTracePC.h
   FuzzerUtil.h
   FuzzerValueBitMap.h)
 
 include_directories(../../include)
 
 CHECK_CXX_SOURCE_COMPILES("

compiler-rt/lib/fuzzer/tests/CMakeLists.txt

 include(CompilerRTCompile)
 
 set(LIBFUZZER_UNITTEST_CFLAGS
   ${COMPILER_RT_UNITTEST_CFLAGS}
   ${COMPILER_RT_GTEST_CFLAGS}
   -I${COMPILER_RT_SOURCE_DIR}/lib/fuzzer
   -fno-rtti
   -O2)
 
 if (APPLE)
   set(FUZZER_SUPPORTED_OS osx)
 endif()
 
-add_custom_target(FuzzerUnitTests)
-set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
-
-add_custom_target(FuzzedDataProviderUnitTests)
-set_target_properties(FuzzedDataProviderUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
-
 set(LIBFUZZER_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS})
 list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS --driver-mode=g++)
 
 if(WIN32)
   list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS -Wl,-defaultlib:libcmt,-defaultlib:oldnames)
 else()
   if (APPLE)
     list(APPEND LIBFUZZER_UNITTEST_CFLAGS -isysroot ${DARWIN_osx_SYSROOT})
     list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
   endif()
   list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS -lpthread)
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
    COMPILER_RT_LIBCXX_PATH AND
    COMPILER_RT_LIBCXXABI_PATH)
   list(APPEND LIBFUZZER_UNITTEST_CFLAGS -nostdinc++)
 endif()
 
 if ("-fvisibility=hidden" IN_LIST LIBFUZZER_CFLAGS)
   # Match visibility settings.
   list(APPEND LIBFUZZER_UNITTEST_CFLAGS "-fvisibility=hidden")
 endif()
 
-if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH)
-  # libFuzzer unit tests are only run on the host machine.
-  set(arch ${COMPILER_RT_DEFAULT_TARGET_ARCH})
-
-  set(LIBFUZZER_TEST_RUNTIME RTFuzzerTest.${arch})
+# Compile test runtime for use in unit tests.
+# generate_libfuzzer_unittests(<runtime> <test architecture>)
+function (generate_libfuzzer_test_runtime runtime arch)
+  cmake_parse_arguments(TEST "" "" "OBJECT_LIBS" ${ARGN})
+  set(name ${runtime}.${arch})
+  set(suffix)
   if(APPLE)
-    set(LIBFUZZER_TEST_RUNTIME_OBJECTS
-      $<TARGET_OBJECTS:RTfuzzer.osx>)
+    set(suffix ${FUZZER_SUPPORTED_OS})
   else()
-    set(LIBFUZZER_TEST_RUNTIME_OBJECTS
-      $<TARGET_OBJECTS:RTfuzzer.${arch}>)
+    set(suffix ${arch})
   endif()
-  add_library(${LIBFUZZER_TEST_RUNTIME} STATIC
-    ${LIBFUZZER_TEST_RUNTIME_OBJECTS})
-  set_target_properties(${LIBFUZZER_TEST_RUNTIME} PROPERTIES
+  set(${name}_TEST_OBJECTS)
+  foreach(object_lib ${TEST_OBJECT_LIBS})
+    list(APPEND ${name}_TEST_OBJECTS $<TARGET_OBJECTS:${object_lib}.${suffix}>)
+  endforeach()
+  add_library(${name} STATIC ${${name}_TEST_OBJECTS})
+  set_target_properties(${name} PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     FOLDER "Compiler-RT Runtime tests")
+endfunction()
+
+# Compile and register compiler-rt/lib/fuzzer tests.
+# generate_libfuzzer_unittests(<prefix> <test architecture>
+#                           NAME <test_name>
+#                           SOURCES <sources to compile>
+#                           RUNTIME <tests runtime to link in>
+#                           DEPS <dependencies>
+# )
+function(generate_libfuzzer_unittests prefix arch)
+  cmake_parse_arguments(TEST "" "NAME;RUNTIME" "SOURCES;DEPS" ${ARGN})
+  if (NOT DEFINED TEST_NAME)
+    set(TEST_NAME ${prefix})
+  endif()
+  add_custom_target(${prefix}UnitTests)
+  set(${prefix}TestObjects)
+  generate_compiler_rt_tests(${prefix}TestObjects
+    "${prefix}UnitTests" "${TEST_NAME}-${arch}-Test" ${arch}
+    SOURCES ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE}
+    RUNTIME ${TEST_RUNTIME}.${arch}
+    DEPS gtest ${LIBFUZZER_TEST_RUNTIME_DEPS} ${TEST_DEPS}
+    CFLAGS ${LIBFUZZER_UNITTEST_CFLAGS} ${LIBFUZZER_TEST_RUNTIME_CFLAGS}
+    LINK_FLAGS ${LIBFUZZER_UNITTEST_LINK_FLAGS} ${LIBFUZZER_TEST_RUNTIME_LINK_FLAGS})
+  set_target_properties(${prefix}UnitTests PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+endfunction()
+
+if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH)
+  # libFuzzer unit tests are only run on the host machine.
+  set(arch ${COMPILER_RT_DEFAULT_TARGET_ARCH})
+
+  generate_libfuzzer_test_runtime(RTFuzzerTest ${arch}
+    OBJECT_LIBS RTfuzzer)
 
   if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
      COMPILER_RT_LIBCXX_PATH AND
      COMPILER_RT_LIBCXXABI_PATH)
     file(GLOB libfuzzer_headers ../*.h)
     set(LIBFUZZER_TEST_RUNTIME_DEPS libcxx_fuzzer_${arch}-build ${libfuzzer_headers})
     set(LIBFUZZER_TEST_RUNTIME_CFLAGS -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1)
     set(LIBFUZZER_TEST_RUNTIME_LINK_FLAGS ${LIBCXX_${arch}_PREFIX}/lib/libc++.a)
   endif()
 
-  set(FuzzerTestObjects)
-  generate_compiler_rt_tests(FuzzerTestObjects
-    FuzzerUnitTests "Fuzzer-${arch}-Test" ${arch}
-    SOURCES FuzzerUnittest.cpp ${COMPILER_RT_GTEST_SOURCE}
-    RUNTIME ${LIBFUZZER_TEST_RUNTIME}
-    DEPS gtest ${LIBFUZZER_TEST_RUNTIME_DEPS} FuzzerTestUtil.h
-    CFLAGS ${LIBFUZZER_UNITTEST_CFLAGS} ${LIBFUZZER_TEST_RUNTIME_CFLAGS}
-    LINK_FLAGS ${LIBFUZZER_UNITTEST_LINK_FLAGS} ${LIBFUZZER_TEST_RUNTIME_LINK_FLAGS})
-  set_target_properties(FuzzerUnitTests PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-  set(FuzzedDataProviderTestObjects)
-  generate_compiler_rt_tests(FuzzedDataProviderTestObjects
-    FuzzedDataProviderUnitTests "FuzzerUtils-${arch}-Test" ${arch}
-    SOURCES FuzzedDataProviderUnittest.cpp ${COMPILER_RT_GTEST_SOURCE}
-    DEPS gtest ${LIBFUZZER_TEST_RUNTIME_DEPS} ${COMPILER_RT_SOURCE_DIR}/include/fuzzer/FuzzedDataProvider.h
-    CFLAGS ${LIBFUZZER_UNITTEST_CFLAGS} ${LIBFUZZER_TEST_RUNTIME_CFLAGS}
-    LINK_FLAGS ${LIBFUZZER_UNITTEST_LINK_FLAGS} ${LIBFUZZER_TEST_RUNTIME_LINK_FLAGS})
-  set_target_properties(FuzzedDataProviderUnitTests PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  generate_libfuzzer_unittests(Fuzzer ${arch}
+    SOURCES FuzzerUnittest.cpp
+    RUNTIME RTFuzzerTest)
+
+  generate_libfuzzer_unittests(FuzzedDataProvider ${arch}
+    NAME FuzzerUtils
+    SOURCES FuzzedDataProviderUnittest.cpp
+    RUNTIME RTFuzzerTest
+    DEPS ${COMPILER_RT_SOURCE_DIR}/include/fuzzer/FuzzedDataProvider.h)
 endif()