diff --git a/compiler-rt/test/ubsan/CMakeLists.txt b/compiler-rt/test/ubsan/CMakeLists.txt index 749446320ff3c87f9d35200770f5178f8780a486..d07d86b66ea2cf780c5d34081de19b8205b9152c 100644 --- a/compiler-rt/test/ubsan/CMakeLists.txt +++ b/compiler-rt/test/ubsan/CMakeLists.txt @@ -41,6 +41,10 @@ if(APPLE) darwin_filter_host_archs(UBSAN_SUPPORTED_ARCH UBSAN_TEST_ARCH) endif() +# OHOS_LOCAL begin +set(SUPPORT_MULTI_SAN !OHOS_FAMILY) +# OHOS_LOCAL end + foreach(arch ${UBSAN_TEST_ARCH}) set(UBSAN_TEST_TARGET_ARCH ${arch}) if (APPLE) @@ -50,7 +54,9 @@ foreach(arch ${UBSAN_TEST_ARCH}) get_test_cc_for_arch(${arch} UBSAN_TEST_TARGET_CC UBSAN_TEST_TARGET_CFLAGS) add_ubsan_testsuites("Standalone" ubsan ${arch}) - if(COMPILER_RT_HAS_ASAN AND ";${ASAN_SUPPORTED_ARCH};" MATCHES ";${arch};") + # OHOS_LOCAL begin + if(SUPPORT_MULTI_SAN AND COMPILER_RT_HAS_ASAN AND ";${ASAN_SUPPORTED_ARCH};" MATCHES ";${arch};") + # OHOS_LOCAL end # TODO(wwchrome): Re-enable ubsan for asan win 64-bit when ready. # Disable ubsan with AddressSanitizer tests for Windows 64-bit, # 64-bit Solaris/x86, and SPARC. @@ -60,10 +66,14 @@ foreach(arch ${UBSAN_TEST_ARCH}) add_ubsan_testsuites("AddressSanitizer" asan ${arch}) endif() endif() - if(COMPILER_RT_HAS_MSAN AND ";${MSAN_SUPPORTED_ARCH};" MATCHES ";${arch};") + # OHOS_LOCAL begin + if(SUPPORT_MULTI_SAN AND COMPILER_RT_HAS_MSAN AND ";${MSAN_SUPPORTED_ARCH};" MATCHES ";${arch};") + # OHOS_LOCAL end add_ubsan_testsuites("MemorySanitizer" msan ${arch}) endif() - if(COMPILER_RT_HAS_TSAN AND ";${TSAN_SUPPORTED_ARCH};" MATCHES ";${arch};" AND NOT ANDROID) + # OHOS_LOCAL begin + if(SUPPORT_MULTI_SAN AND COMPILER_RT_HAS_TSAN AND ";${TSAN_SUPPORTED_ARCH};" MATCHES ";${arch};" AND NOT ANDROID) + # OHOS_LOCAL end add_ubsan_testsuites("ThreadSanitizer" tsan ${arch}) endif() endforeach()