diff options
| author | Filipe Cabecinhas <me@filcab.net> | 2015-02-20 03:41:07 +0000 |
|---|---|---|
| committer | Filipe Cabecinhas <me@filcab.net> | 2015-02-20 03:41:07 +0000 |
| commit | a1225be1ea3e37d9983e7f17df00a80a1dd349fb (patch) | |
| tree | 27fc799aed12b10edfac1f5105ae31650efe94eb | |
| parent | 11f42aa2854bf27a7eb38e3fbfe1fe0f5a24a24a (diff) | |
| download | bcm5719-llvm-a1225be1ea3e37d9983e7f17df00a80a1dd349fb.tar.gz bcm5719-llvm-a1225be1ea3e37d9983e7f17df00a80a1dd349fb.zip | |
Make FileCheck be a common dependency, not an ASan one.
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.
Reviewers: samsonov, eugenis
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D7740
llvm-svn: 229962
| -rw-r--r-- | compiler-rt/test/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | compiler-rt/test/asan/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index 2ceb86463ae..dd3cbe9add5 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -7,6 +7,12 @@ configure_lit_site_cfg( # 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 SANITIZER_COMMON_LIT_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) diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt index 0c46ef7e6e3..e1b81264604 100644 --- a/compiler-rt/test/asan/CMakeLists.txt +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -55,11 +55,7 @@ foreach(arch ${ASAN_SUPPORTED_ARCH}) 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}) |
