Revert "[libFuzzer] Support using libc++"

This reverts commit r322604: test is failing for standalone compiler-rt.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@322689 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 20 insertions, 49 deletions

diff --git a/test/fuzzer/CMakeLists.txt b/test/fuzzer/CMakeLists.txt
index 25b1a44de..bd5111232 100644
--- a/test/fuzzer/CMakeLists.txt
+++ b/test/fuzzer/CMakeLists.txt
@@ -8,65 +8,36 @@ if(COMPILER_RT_INCLUDE_TESTS)
   list(APPEND LIBFUZZER_TEST_DEPS FuzzerUnitTests)
 endif()
 
-add_custom_target(check-fuzzer)
+set(LIBFUZZER_TESTSUITES)
+
 
 if(COMPILER_RT_INCLUDE_TESTS)
   # libFuzzer unit tests.
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/unit/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/unit/lit.site.cfg)
-  add_lit_testsuite(check-fuzzer-unit "Running Fuzzer unit tests"
-    ${CMAKE_CURRENT_BINARY_DIR}/unit
-    DEPENDS ${LIBFUZZER_TEST_DEPS})
-  set_target_properties(check-fuzzer-unit PROPERTIES FOLDER "Compiler-RT Tests")
-  add_dependencies(check-fuzzer check-fuzzer-unit)
+  list(APPEND LIBFUZZER_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/unit)
 endif()
 
-macro(test_fuzzer stdlib)
-  cmake_parse_arguments(TEST "" "" "DEPS" ${ARGN})
-  string(REPLACE "+" "x" stdlib_name ${stdlib})
-  string(REPLACE "-" ";" stdlib_list ${stdlib_name})
-  set(STDLIB_CAPITALIZED "")
-  foreach(part IN LISTS stdlib_list)
-    string(SUBSTRING ${part} 0 1 first_letter)
-    string(TOUPPER ${first_letter} first_letter)
-    string(REGEX REPLACE "^.(.*)" "${first_letter}\\1" part "${part}")
-    set(STDLIB_CAPITALIZED "${STDLIB_CAPITALIZED}${part}")
-  endforeach()
-  foreach(arch ${FUZZER_SUPPORTED_ARCH})
-    set(LIBFUZZER_TEST_COMPILER ${COMPILER_RT_TEST_COMPILER})
-    get_test_cc_for_arch(${arch} LIBFUZZER_TEST_COMPILER LIBFUZZER_TEST_FLAGS)
-
-    set(LIBFUZZER_TEST_STDLIB ${stdlib})
-
-    string(TOUPPER ${arch} ARCH_UPPER_CASE)
-    set(CONFIG_NAME ${ARCH_UPPER_CASE}${STDLIB_CAPITALIZED}${OS_NAME}Config)
+foreach(arch ${FUZZER_SUPPORTED_ARCH})
+  set(LIBFUZZER_TEST_COMPILER ${COMPILER_RT_TEST_COMPILER})
+  get_test_cc_for_arch(${arch} LIBFUZZER_TEST_COMPILER LIBFUZZER_TEST_FLAGS)
 
-    # LIT-based libFuzzer tests.
-    configure_lit_site_cfg(
-      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
-      )
+  string(TOUPPER ${arch} ARCH_UPPER_CASE)
+  set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
 
-    add_lit_testsuite(check-fuzzer-${stdlib_name} "Running Fuzzer ${stdlib} tests"
-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}
-      DEPENDS ${LIBFUZZER_TEST_DEPS})
-    if(TEST_DEPS)
-      add_dependencies(check-fuzzer-${stdlib_name} ${TEST_DEPS})
-    endif()
-    set_target_properties(check-fuzzer-${stdlib_name} PROPERTIES FOLDER "Compiler-RT Tests")
-    add_dependencies(check-fuzzer check-fuzzer-${stdlib_name})
-  endforeach()
-endmacro()
+  # LIT-based libFuzzer tests.
+  configure_lit_site_cfg(
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+    )
+  list(APPEND LIBFUZZER_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
 
-test_fuzzer("default")
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-  if(TARGET cxx_shared)
-    test_fuzzer("libc++" DEPS cxx_shared)
-  endif()
-  if(TARGET cxx_static)
-    test_fuzzer("static-libc++" DEPS cxx_static)
-  endif()
-endif()
+endforeach()
 
 set(EXCLUDE_FROM_ALL ON)
+
+add_lit_testsuite(check-fuzzer "Running Fuzzer tests"
+  ${LIBFUZZER_TESTSUITES}
+  DEPENDS ${LIBFUZZER_TEST_DEPS})
+set_target_properties(check-fuzzer PROPERTIES FOLDER "Compiler-RT Tests")