Skip to content

Commit

Permalink
[sanitizer] Remove "-android" from test_arch.
Browse files Browse the repository at this point in the history
Summary:
ASan and Scudo tests are adding "-android" to test arch.
There are no tests that depend on it as far as I can see.
If necessary, do this instead:
  REQUIRES: aarch64-target-arch && android

Reviewers: pcc, vitalybuka

Subscribers: srhines, kubamracek, mgorny, javed.absar, kristof.beyls, cryptoad, #sanitizers, llvm-commits

Tags: #sanitizers, #llvm

Differential Revision: https://reviews.llvm.org/D58532

llvm-svn: 354829
  • Loading branch information
eugenis committed Feb 25, 2019
1 parent 7525797 commit f3b8c85
Showing 2 changed files with 2 additions and 16 deletions.
8 changes: 1 addition & 7 deletions compiler-rt/test/asan/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -45,14 +45,8 @@ if(OS_NAME MATCHES "SunOS")
endif()

foreach(arch ${ASAN_TEST_ARCH})
if(ANDROID)
set(ASAN_TEST_TARGET_ARCH ${arch}-android)
else()
set(ASAN_TEST_TARGET_ARCH ${arch})
endif()

set(ASAN_TEST_TARGET_ARCH ${arch})
set(ASAN_TEST_APPLE_PLATFORM "osx")

string(TOLOWER "-${arch}-${OS_NAME}" ASAN_TEST_CONFIG_SUFFIX)
get_bits_for_arch(${arch} ASAN_TEST_BITS)
get_test_cc_for_arch(${arch} ASAN_TEST_TARGET_CC ASAN_TEST_TARGET_CFLAGS)
10 changes: 1 addition & 9 deletions compiler-rt/test/scudo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -15,15 +15,7 @@ configure_lit_site_cfg(

set(SCUDO_TEST_ARCH ${SCUDO_SUPPORTED_ARCH})
foreach(arch ${SCUDO_TEST_ARCH})
if(ANDROID)
if (${arch} STREQUAL "i386")
set(SCUDO_TEST_TARGET_ARCH i686-android)
else()
set(SCUDO_TEST_TARGET_ARCH ${arch}-android)
endif()
else()
set(SCUDO_TEST_TARGET_ARCH ${arch})
endif()
set(SCUDO_TEST_TARGET_ARCH ${arch})
string(TOLOWER "-${arch}" SCUDO_TEST_CONFIG_SUFFIX)
get_test_cc_for_arch(${arch} SCUDO_TEST_TARGET_CC SCUDO_TEST_TARGET_CFLAGS)
string(TOUPPER ${arch} ARCH_UPPER_CASE)

0 comments on commit f3b8c85

Please sign in to comment.