diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-10-11 21:22:45 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-10-11 21:22:45 +0000 |
| commit | e3e1659d13986a80ea90f480ddf5af45f1134c48 (patch) | |
| tree | aa338870d0f235d728768efd35ed92ed9073bcd8 | |
| parent | c16a15f6ecaface37c1e85811035c25516ce5e41 (diff) | |
| download | compiler-rt-e3e1659d13986a80ea90f480ddf5af45f1134c48.tar.gz | |
Disable TSan tests on Android.
They never passed. This change excludes them from 'check-all'.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@315512 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/tsan/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lib/tsan/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/tsan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/tsan/lit.cfg | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/lib/tsan/CMakeLists.txt b/lib/tsan/CMakeLists.txt index 5e3bb102b..08974a467 100644 --- a/lib/tsan/CMakeLists.txt +++ b/lib/tsan/CMakeLists.txt @@ -222,7 +222,8 @@ endif() # Build libcxx instrumented with TSan. if(COMPILER_RT_HAS_LIBCXX_SOURCES AND - COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang") + COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang" AND + NOT ANDROID) set(libcxx_tsan_deps) foreach(arch ${TSAN_SUPPORTED_ARCH}) get_target_flags_for_arch(${arch} TARGET_CFLAGS) diff --git a/lib/tsan/tests/CMakeLists.txt b/lib/tsan/tests/CMakeLists.txt index f5e4caef2..ad8d02ed3 100644 --- a/lib/tsan/tests/CMakeLists.txt +++ b/lib/tsan/tests/CMakeLists.txt @@ -63,7 +63,7 @@ macro(add_tsan_unittest testname) endif() endmacro() -if(COMPILER_RT_CAN_EXECUTE_TESTS) +if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID) add_subdirectory(rtl) add_subdirectory(unit) endif() diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt index a68908612..af329562d 100644 --- a/test/tsan/CMakeLists.txt +++ b/test/tsan/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT COMPILER_RT_STANDALONE_BUILD) endif() if(COMPILER_RT_HAS_LIBCXX_SOURCES AND COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang" - AND NOT APPLE) + AND NOT APPLE AND NOT ANDROID) list(APPEND TSAN_TEST_DEPS libcxx_tsan) set(TSAN_HAS_LIBCXX True) else() diff --git a/test/tsan/lit.cfg b/test/tsan/lit.cfg index 10f31b06e..95c7d7cc3 100644 --- a/test/tsan/lit.cfg +++ b/test/tsan/lit.cfg @@ -83,5 +83,8 @@ config.suffixes = ['.c', '.cc', '.cpp', '.m', '.mm'] if config.host_os not in ['FreeBSD', 'Linux', 'Darwin']: config.unsupported = True +if config.android: + config.unsupported = True + if config.host_os == 'Darwin' and config.target_arch in ["x86_64", "x86_64h"]: config.parallelism_group = "darwin-64bit-sanitizer" |