This is an archive of the discontinued LLVM Phabricator instance.

Differential D58532

[sanitizer] Remove "-android" from test_arch.
ClosedPublic

Authored by eugenis on Feb 21 2019, 4:19 PM.

Details

Reviewers
pcc
vitalybuka
Commits
rCRT354829: [sanitizer] Remove "-android" from test_arch.
rGf3b8c8509b46: [sanitizer] Remove "-android" from test_arch.
rL354829: [sanitizer] Remove "-android" from test_arch.
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

Diff Detail

Event Timeline

eugenis created this revision.Feb 21 2019, 4:19 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptFeb 21 2019, 4:19 PM
Herald added subscribers: Restricted Project, cryptoad, kristof.beyls and 4 others. · View Herald Transcript
Harbormaster completed remote builds in B28402: Diff 187888.Feb 21 2019, 4:19 PM
eugenis added a child revision: D58533: [hwasan, asan] Intercept vfork..Feb 21 2019, 4:24 PM
eugenis mentioned this in D58533: [hwasan, asan] Intercept vfork..Feb 22 2019, 3:49 PM
pcc accepted this revision.Feb 22 2019, 3:52 PM

LGTM

This revision is now accepted and ready to land.Feb 22 2019, 3:52 PM
Closed by commit rL354829: [sanitizer] Remove "-android" from test_arch. (authored by eugenis). · Explain WhyFeb 25 2019, 2:33 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptFeb 25 2019, 2:33 PM

Revision Contents

PathSize
compiler-rt/
test/
asan/
8 lines
scudo/
10 lines

Diff 187888

compiler-rt/test/asan/CMakeLists.txt

Show All 39 Lines
if(APPLE) if(APPLE)
darwin_filter_host_archs(ASAN_SUPPORTED_ARCH ASAN_TEST_ARCH) darwin_filter_host_archs(ASAN_SUPPORTED_ARCH ASAN_TEST_ARCH)
endif() endif()
if(OS_NAME MATCHES "SunOS") if(OS_NAME MATCHES "SunOS")
list(REMOVE_ITEM ASAN_TEST_ARCH x86_64) list(REMOVE_ITEM ASAN_TEST_ARCH x86_64)
endif() endif()
foreach(arch ${ASAN_TEST_ARCH}) foreach(arch ${ASAN_TEST_ARCH})
if(ANDROID)
set(ASAN_TEST_TARGET_ARCH ${arch}-android)
else()
set(ASAN_TEST_TARGET_ARCH ${arch}) set(ASAN_TEST_TARGET_ARCH ${arch})
endif()
set(ASAN_TEST_APPLE_PLATFORM "osx") set(ASAN_TEST_APPLE_PLATFORM "osx")
string(TOLOWER "-${arch}-${OS_NAME}" ASAN_TEST_CONFIG_SUFFIX) string(TOLOWER "-${arch}-${OS_NAME}" ASAN_TEST_CONFIG_SUFFIX)
get_bits_for_arch(${arch} ASAN_TEST_BITS) get_bits_for_arch(${arch} ASAN_TEST_BITS)
get_test_cc_for_arch(${arch} ASAN_TEST_TARGET_CC ASAN_TEST_TARGET_CFLAGS) get_test_cc_for_arch(${arch} ASAN_TEST_TARGET_CC ASAN_TEST_TARGET_CFLAGS)
if(ANDROID OR APPLE) if(ANDROID OR APPLE)
set(ASAN_TEST_DYNAMIC True) set(ASAN_TEST_DYNAMIC True)
else() else()
set(ASAN_TEST_DYNAMIC False) set(ASAN_TEST_DYNAMIC False)
endif() endif()
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines

compiler-rt/test/scudo/CMakeLists.txt

Show All 9 Lines
configure_lit_site_cfg( configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
) )
set(SCUDO_TEST_ARCH ${SCUDO_SUPPORTED_ARCH}) set(SCUDO_TEST_ARCH ${SCUDO_SUPPORTED_ARCH})
foreach(arch ${SCUDO_TEST_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}) set(SCUDO_TEST_TARGET_ARCH ${arch})
endif()
string(TOLOWER "-${arch}" SCUDO_TEST_CONFIG_SUFFIX) string(TOLOWER "-${arch}" SCUDO_TEST_CONFIG_SUFFIX)
get_test_cc_for_arch(${arch} SCUDO_TEST_TARGET_CC SCUDO_TEST_TARGET_CFLAGS) get_test_cc_for_arch(${arch} SCUDO_TEST_TARGET_CC SCUDO_TEST_TARGET_CFLAGS)
string(TOUPPER ${arch} ARCH_UPPER_CASE) string(TOUPPER ${arch} ARCH_UPPER_CASE)
set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
configure_lit_site_cfg( configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg)
Show All 9 Lines