Skip to content

Remove hard reset of radsan test arch #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 21, 2023
Merged

Remove hard reset of radsan test arch #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27ee947
Remove hard reset of radsan test arch
davidtrevelyan Dec 20, 2023
3052969
Reset non-instrumented test objects variable in arch loop
davidtrevelyan Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions compiler-rt/lib/radsan/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ if (APPLE)
list(APPEND RADSAN_UNITTEST_LINK_FLAGS ${DARWIN_osx_LINK_FLAGS})
list(APPEND RADSAN_UNITTEST_CFLAGS ${DARWIN_osx_CFLAGS})
else()
#append_list_if(COMPILER_RT_HAS_LIBATOMIC -latomic RADSAN_UNITTEST_LINK_FLAGS)
list(APPEND RADSAN_UNITTEST_LINK_FLAGS -latomic)
endif()

Expand All @@ -54,8 +53,6 @@ if(APPLE)
endif()

foreach(arch ${RADSAN_TEST_ARCH})
set(arch ${COMPILER_RT_DEFAULT_TARGET_ARCH})

set(RadsanTestObjects)
generate_compiler_rt_tests(RadsanTestObjects
RadsanUnitTests "Radsan-${arch}-Test" ${arch}
Expand Down Expand Up @@ -91,6 +88,7 @@ foreach(arch ${RADSAN_TEST_ARCH})
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests")

set(RadsanNoInstTestObjects)
generate_compiler_rt_tests(RadsanNoInstTestObjects
RadsanUnitTests "Radsan-${arch}-NoInstTest" ${arch}
COMPILE_DEPS ${RADSAN_UNITTEST_HEADERS}
Expand Down
7 changes: 0 additions & 7 deletions compiler-rt/test/radsan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,12 @@ set(RADSAN_FDR_TESTSUITES)

set(RADSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
set(RADSAN_FDR_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})

# if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_RADSAN AND
# COMPILER_RT_HAS_RADSAN)
# list(APPEND RADSAN_TEST_DEPS radsan llvm-xray)
# endif()

set(RADSAN_TEST_ARCH ${RADSAN_SUPPORTED_ARCH})
if(APPLE)
darwin_filter_host_archs(RADSAN_SUPPORTED_ARCH RADSAN_TEST_ARCH)
endif()

if (COMPILER_RT_HAS_RADSAN)
message ("SUPPORTED ARCHS: ${RADSAN_TEST_ARCH}")
foreach(arch ${RADSAN_TEST_ARCH})
set(RADSAN_TEST_TARGET_ARCH ${arch})
string(TOLOWER "-${arch}-${OS_NAME}" RADSAN_TEST_CONFIG_SUFFIX)
Expand Down