diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2017-09-16 03:26:03 +0000 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2017-09-16 03:26:03 +0000 |
| commit | 9ad3f746861b60ba767d92d23a8a9920dbcd1af4 (patch) | |
| tree | 5bcda954dfa7a31f675348ae6a3d47e65199fdc2 | |
| parent | 763214631ca3644bca56db75e36988068ff72ee2 (diff) | |
[asan] Enable asan_and_llvm_coverage_test.cc on Android
Test just needs profile.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@313438 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | test/asan/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/asan/TestCases/asan_and_llvm_coverage_test.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2e344056f..6bc7cdbec 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,6 +9,11 @@ configure_lit_site_cfg( # add_subdirectory(BlocksRuntime) set(SANITIZER_COMMON_LIT_TEST_DEPS) + +if (COMPILER_RT_HAS_PROFILE) + list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS profile) +endif() + if(COMPILER_RT_STANDALONE_BUILD) add_executable(FileCheck IMPORTED GLOBAL) set_property(TARGET FileCheck PROPERTY IMPORTED_LOCATION ${LLVM_TOOLS_BINARY_DIR}/FileCheck) @@ -23,9 +28,6 @@ if(NOT ANDROID) list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS clang clang-headers FileCheck count not llvm-config llvm-nm llvm-objdump llvm-readobj llvm-symbolizer compiler-rt-headers sancov) - if (COMPILER_RT_HAS_PROFILE) - list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS profile) - endif() if (WIN32) list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS KillTheDoctor) endif() diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt index bd6834d74..739ae56e7 100644 --- a/test/asan/CMakeLists.txt +++ b/test/asan/CMakeLists.txt @@ -31,9 +31,7 @@ set(ASAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND ASAN_TEST_DEPS asan) if(NOT APPLE AND COMPILER_RT_HAS_LLD) - list(APPEND ASAN_TEST_DEPS - lld - ) + list(APPEND ASAN_TEST_DEPS lld) endif() endif() set(ASAN_DYNAMIC_TEST_DEPS ${ASAN_TEST_DEPS}) diff --git a/test/asan/TestCases/asan_and_llvm_coverage_test.cc b/test/asan/TestCases/asan_and_llvm_coverage_test.cc index d53deb447..1574a3443 100644 --- a/test/asan/TestCases/asan_and_llvm_coverage_test.cc +++ b/test/asan/TestCases/asan_and_llvm_coverage_test.cc @@ -1,6 +1,6 @@ // RUN: %clangxx_asan -coverage -O0 %s -o %t // RUN: %env_asan_opts=check_initialization_order=1 %run %t 2>&1 | FileCheck %s -// XFAIL: android + // We don't really support running tests using profile runtime on Windows. // UNSUPPORTED: win32 #include <stdio.h> |