[compiler-rt] r354829 - [sanitizer] Remove "-android" from test_arch.
Evgeniy Stepanov via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 25 14:32:31 PST 2019
Author: eugenis
Date: Mon Feb 25 14:32:30 2019
New Revision: 354829
URL: http://llvm.org/viewvc/llvm-project?rev=354829&view=rev
Log:
[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
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
Modified:
compiler-rt/trunk/test/asan/CMakeLists.txt
compiler-rt/trunk/test/scudo/CMakeLists.txt
Modified: compiler-rt/trunk/test/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/CMakeLists.txt?rev=354829&r1=354828&r2=354829&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/asan/CMakeLists.txt Mon Feb 25 14:32:30 2019
@@ -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)
Modified: compiler-rt/trunk/test/scudo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/scudo/CMakeLists.txt?rev=354829&r1=354828&r2=354829&view=diff
==============================================================================
--- compiler-rt/trunk/test/scudo/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/scudo/CMakeLists.txt Mon Feb 25 14:32:30 2019
@@ -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)
More information about the llvm-commits
mailing list