[PATCH] D63982: [ubsan][test] Don't disable ubsan testing on 64-bit Solaris/x86
Rainer Orth via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 8 02:18:31 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL365302: [ubsan][test] Don't disable ubsan testing on 64-bit Solaris/x86 (authored by ro, committed by ).
Herald added a subscriber: delcypher.
Changed prior to commit:
https://reviews.llvm.org/D63982?vs=207242&id=208334#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D63982/new/
https://reviews.llvm.org/D63982
Files:
compiler-rt/trunk/test/ubsan/CMakeLists.txt
compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt
Index: compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt
+++ compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt
@@ -4,9 +4,6 @@
if(APPLE)
darwin_filter_host_archs(UBSAN_SUPPORTED_ARCH UBSAN_TEST_ARCH)
endif()
-if(OS_NAME MATCHES "SunOS")
- list(REMOVE_ITEM UBSAN_TEST_ARCH x86_64)
-endif()
set(UBSAN_TESTSUITES)
set(UBSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
Index: compiler-rt/trunk/test/ubsan/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/test/ubsan/CMakeLists.txt
+++ compiler-rt/trunk/test/ubsan/CMakeLists.txt
@@ -38,9 +38,6 @@
if(APPLE)
darwin_filter_host_archs(UBSAN_SUPPORTED_ARCH UBSAN_TEST_ARCH)
endif()
-if(OS_NAME MATCHES "SunOS")
- list(REMOVE_ITEM UBSAN_TEST_ARCH x86_64)
-endif()
foreach(arch ${UBSAN_TEST_ARCH})
set(UBSAN_TEST_TARGET_ARCH ${arch})
@@ -49,8 +46,10 @@
if(COMPILER_RT_HAS_ASAN AND ";${ASAN_SUPPORTED_ARCH};" MATCHES ";${arch};")
# TODO(wwchrome): Re-enable ubsan for asan win 64-bit when ready.
- # Disable ubsan with AddressSanitizer tests for Windows 64-bit.
- if(NOT OS_NAME MATCHES "Windows" OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+ # Disable ubsan with AddressSanitizer tests for Windows 64-bit and
+ # 64-bit Solaris/x86.
+ if((NOT (OS_NAME MATCHES "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 8)) AND
+ (NOT (OS_NAME MATCHES "SunOS" AND ${arch} MATCHES x86_64)))
add_ubsan_testsuites("AddressSanitizer" asan ${arch})
endif()
endif()
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63982.208334.patch
Type: text/x-patch
Size: 1620 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190708/6d2d3829/attachment.bin>
More information about the llvm-commits
mailing list