From 45500fcd5dee4b348decac75ec00d7f071211345 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Fri, 7 Jun 2019 20:56:32 +0000 Subject: [PATCH] [GWP-ASan] Removed unittests from Android build. Summary: Longstanding issues in the Android test runner means that compiler-rt unit tests don't work on Android due to libc++ link-time issues. Looks like the exported libc++ from the Android NDK is x86-64, even though it's part of the ARM[64] toolchain... See similar measures for ASan and sanitizer-common that disable unit tests for Android. Should fully fix the Android bots (@vlad.tsyrklevich). Reviewers: vitalybuka Reviewed By: vitalybuka Subscribers: srhines, kubamracek, mgorny, javed.absar, kristof.beyls, #sanitizers, llvm-commits, vlad.tsyrklevich Tags: #sanitizers, #llvm Differential Revision: https://reviews.llvm.org/D63019 llvm-svn: 362842 --- compiler-rt/test/gwp_asan/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler-rt/test/gwp_asan/CMakeLists.txt b/compiler-rt/test/gwp_asan/CMakeLists.txt index 2782b9a0c110..4541b8508927 100644 --- a/compiler-rt/test/gwp_asan/CMakeLists.txt +++ b/compiler-rt/test/gwp_asan/CMakeLists.txt @@ -8,7 +8,12 @@ set(GWP_ASAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS} gwp_asan) -if (COMPILER_RT_INCLUDE_TESTS) +# Longstanding issues in the Android test runner means that compiler-rt unit +# tests don't work on Android due to libc++ link-time issues. Looks like the +# exported libc++ from the Android NDK is x86-64, even though it's part of the +# ARM[64] toolchain... See similar measures for ASan and sanitizer-common that +# disable unit tests for Android. +if (COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_GWP_ASAN AND NOT ANDROID) list(APPEND GWP_ASAN_TEST_DEPS GwpAsanUnitTests) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/unit/lit.site.cfg.in