Make FileCheck be a common dependency, not an ASan one.

[filcab]

Summary

It still gets picked up by ASan, but it also gets picked up by the other
test suites.

Otherwise, some test suites (e.g: UBSan) would complain they had no
dependencies, and wouldn't run.

[pcc]

Was this fixed by r229753?

[filcab]

It might have been, thanks for pointing it out.
I will check it and report back or re-submit as a fix to remove our
workaround.

Thanks,

Filipe

[filcab]

Yes, r229753 makes it work without the workaround.

I'm just not sure what would be preferred:

• To have the explicit FileCheck (and not, at the very least) dependency
• Or to simply not have those dependencies and let lit error out if it

can't find them;

Filipe

[samsonov]

test/CMakeLists.txt

13

Shouldn't you append it to SANITIZER_COMMON_LIT_TEST_DEPS instead?

[filcab]

Fixed a copy-paste problem spotted by Alexey

[filcab]

Submitted a new patch with the fixed variable name

test/CMakeLists.txt

13

Yes, of course.

[samsonov]

Please submit after fixing the error below:

test/CMakeLists.txt

13

I believe this is still wrong =)
Should be SANITIZER_COMMON_LIT_TEST_DEPS

[filcab]

Wow, my face is red.
Thanks :-)

test/CMakeLists.txt

 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
 
 # BlocksRuntime and builtins testsuites are not yet ported to lit.
 # add_subdirectory(BlocksRuntime)
 # add_subdirectory(builtins)
 
 set(SANITIZER_COMMON_LIT_TEST_DEPS)
+if(COMPILER_RT_STANDALONE_BUILD)
+  add_executable(FileCheck IMPORTED GLOBAL)
+  set_property(TARGET FileCheck PROPERTY IMPORTED_LOCATION ${LLVM_TOOLS_BINARY_DIR}/FileCheck)
+  list(APPEND ASAN_TEST_DEPS FileCheck)
+endif()
+
 # When ANDROID, we build tests with the host compiler (i.e. CMAKE_C_COMPILER),
 # and run tests with tools from the host toolchain.
 if(NOT ANDROID)
   if(NOT COMPILER_RT_STANDALONE_BUILD)
     # Use LLVM utils and Clang from the same build tree.
     list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS
       clang clang-headers FileCheck count not llvm-nm llvm-symbolizer
       compiler-rt-headers)

test/asan/CMakeLists.txt

configure_lit_site_cfg(
       ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
       ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg)
     list(APPEND ASAN_DYNAMIC_TESTSUITES
       ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
   endif()
 endforeach()
 
 set(ASAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
-if(COMPILER_RT_STANDALONE_BUILD)
-  add_executable(FileCheck IMPORTED GLOBAL)
-  set_property(TARGET FileCheck PROPERTY IMPORTED_LOCATION ${LLVM_TOOLS_BINARY_DIR}/FileCheck)
-  list(APPEND ASAN_TEST_DEPS FileCheck)
-else()
+if(NOT COMPILER_RT_STANDALONE_BUILD)
   list(APPEND ASAN_TEST_DEPS asan)
 endif()
 set(ASAN_DYNAMIC_TEST_DEPS ${ASAN_TEST_DEPS})
 
 # Add unit tests.
 if(COMPILER_RT_INCLUDE_TESTS)
   set(ASAN_TEST_DYNAMIC False)
   configure_lit_site_cfg(