Disable TSan tests on Android.

They never passed. This change excludes them from 'check-all'.

llvm-svn: 315512
This commit is contained in:
Evgeniy Stepanov 2017-10-11 21:22:45 +00:00
parent 3747b826c4
commit 1961c6cb2c
4 changed files with 7 additions and 3 deletions

View File

@ -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)

View File

@ -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()

View File

@ -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()

View File

@ -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"