[compiler-rt] r365302 - [ubsan][test] Don't disable ubsan testing on 64-bit Solaris/x86

[Rainer Orth via llvm-commits]

Author: ro
Date: Mon Jul  8 02:18:38 2019
New Revision: 365302

URL: http://llvm.org/viewvc/llvm-project?rev=365302&view=rev
Log:
[ubsan][test] Don't disable ubsan testing on 64-bit Solaris/x86

Unlike asan, which isn't supported yet on 64-bit Solaris/x86, there's no reason to disable
ubsan.  This patch does that, but keeps the 64-bit ubsan-with-asan tests disabled.

Tested on x86_64-pc-solaris2.11.

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

Modified:
    compiler-rt/trunk/test/ubsan/CMakeLists.txt
    compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt

Modified: compiler-rt/trunk/test/ubsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/CMakeLists.txt?rev=365302&r1=365301&r2=365302&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/ubsan/CMakeLists.txt Mon Jul  8 02:18:38 2019
@@ -38,9 +38,6 @@ set(UBSAN_TEST_ARCH ${UBSAN_SUPPORTED_AR
 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 @@ foreach(arch ${UBSAN_TEST_ARCH})
 
   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()

Modified: compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt?rev=365302&r1=365301&r2=365302&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/ubsan_minimal/CMakeLists.txt Mon Jul  8 02:18:38 2019
@@ -4,9 +4,6 @@ set(UBSAN_TEST_ARCH ${UBSAN_SUPPORTED_AR
 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})