Skip to content

Commit 6b84537

Browse files
authored
[rtsan] Re-enable rtsan tests (#98219)
Follow up to #92460 DEPS llvm_gtest is not used by compiler-rt, compiler-rt compiles them with COMPILER_RT_GOOGLETEST_SOURCES. This reverts commit e217f98.
1 parent 7bfb98c commit 6b84537

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
3232
${LOONGARCH64})
3333
set(ALL_ASAN_ABI_SUPPORTED_ARCH ${X86_64} ${ARM64} ${ARM64_32})
3434
set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64} ${LOONGARCH64})
35-
#set(ALL_RTSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
36-
# ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON}
37-
# ${LOONGARCH64})
35+
set(ALL_RTSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
36+
${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON}
37+
${LOONGARCH64})
3838

3939
if(ANDROID)
4040
set(OS_NAME "Android")

compiler-rt/cmake/config-ix.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,8 @@ else()
751751
set(COMPILER_RT_HAS_ASAN FALSE)
752752
endif()
753753

754-
if (COMPILER_RT_HAS_SANITIZER_COMMON AND RTSAN_SUPPORTED_ARCH)
754+
if (COMPILER_RT_HAS_SANITIZER_COMMON AND RTSAN_SUPPORTED_ARCH AND
755+
OS_NAME MATCHES "Android|Darwin|Linux")
755756
set(COMPILER_RT_HAS_RTSAN TRUE)
756757
else()
757758
set(COMPILER_RT_HAS_RTSAN FALSE)

compiler-rt/lib/rtsan/tests/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ foreach(arch ${RTSAN_TEST_ARCH})
6060
# RtsanUnitTests "Rtsan-${arch}-Test" ${arch}
6161
# COMPILE_DEPS ${RTSAN_UNITTEST_HEADERS}
6262
# SOURCES ${RTSAN_INST_TEST_SOURCES} ${COMPILER_RT_GOOGLETEST_SOURCES}
63-
# DEPS llvm_gtest rtsan
63+
# DEPS rtsan
6464
# CFLAGS ${RTSAN_UNITTEST_CFLAGS} -fsanitize=realtime
6565
# LINK_FLAGS ${RTSAN_UNITTEST_LINK_FLAGS} -fsanitize=realtime)
6666

@@ -94,7 +94,6 @@ foreach(arch ${RTSAN_TEST_ARCH})
9494
COMPILE_DEPS ${RTSAN_UNITTEST_HEADERS}
9595
SOURCES ${RTSAN_NOINST_TEST_SOURCES}
9696
${COMPILER_RT_GOOGLETEST_SOURCES}
97-
DEPS llvm_gtest
9897
CFLAGS ${RTSAN_UNITTEST_CFLAGS}
9998
LINK_FLAGS ${RTSAN_UNITTEST_LINK_FLAGS}
10099
RUNTIME ${RTSAN_TEST_RUNTIME})

0 commit comments

Comments
 (0)