Skip to content
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

Jump to bottom

Added more sanitizers #44

Merged
merged 1 commit into from
Oct 28, 2023
Merged

Added more sanitizers #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ jobs:
strategy:
matrix:
ctect_option:
- "-DCHAIVM_ADD_SANITIZERS=OFF"
- "-DCHAIVM_ADD_SANITIZERS=ON"
- "-DCHAIVM_ADD_MEM_SANITIZER=OFF -DCHAIVM_ADD_THREAD_SANITIZER=OFF"
- "-DCHAIVM_ADD_MEM_SANITIZER=OFF -DCHAIVM_ADD_THREAD_SANITIZER=ON"
- "-DCHAIVM_ADD_MEM_SANITIZER=ON -DCHAIVM_ADD_THREAD_SANITIZER=OFF"
steps:
- uses: actions/checkout@v3
with:
Expand Down
18 changes: 11 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,23 @@ build: init
cmake -S $(PWD) -B $(PWD)/$(BUILD_DIR) -DCHAIVM_ADD_SANITIZERS=OFF
cmake --build $(PWD)/$(BUILD_DIR) --parallel $(JOBS)

.PHONY: build-memcheck
build-memcheck: init
cmake -S $(PWD) -B $(PWD)/$(BUILD_DIR) -DCHAIVM_ADD_SANITIZERS=ON
cmake --build $(PWD)/$(BUILD_DIR) --parallel $(JOBS)

.PHONY: test
test: build
export GTEST_COLOR=1 && ctest --test-dir $(PWD)/$(BUILD_DIR)/test --parallel $(JOBS) --output-on-failure

.PHONY: test-memcheck
test-memcheck: build-memcheck
.PHONY: execute-tests-inside-make
execute-tests-inside-make:
cmake --build $(PWD)/$(BUILD_DIR) --parallel $(JOBS)
export GTEST_COLOR=1 && ctest --test-dir $(PWD)/$(BUILD_DIR)/test --parallel $(JOBS) --output-on-failure


.PHONY: test-extended
test-extended: init
cmake -S $(PWD) -B $(PWD)/$(BUILD_DIR) -DCHAIVM_ADD_MEM_SANITIZER=OFF -DCHAIVM_ADD_THREAD_SANITIZER=ON
$(MAKE) execute-tests-inside-make
cmake -S $(PWD) -B $(PWD)/$(BUILD_DIR) -DCHAIVM_ADD_MEM_SANITIZER=ON -DCHAIVM_ADD_THREAD_SANITIZER=OFF
$(MAKE) execute-tests-inside-make

.PHONY: bench
bench: init
cmake -S $(PWD) -B $(PWD)/$(BUILD_DIR) -DCHAI_BENCH=1
Expand Down
14 changes: 9 additions & 5 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ function(chai_test SOURCE_NAME)
add_executable(${TARGET_NAME})
target_sources(${TARGET_NAME} PRIVATE ${SOURCE_NAME})
target_link_libraries(${TARGET_NAME} PRIVATE chai_testif)
if (CHAIVM_ADD_SANITIZERS)
# @todo #37:60min Make address sanitizer work on MacOS with ARM
target_compile_options(${TARGET_NAME} PRIVATE -fsanitize=address)
target_link_options(${TARGET_NAME} PRIVATE -fsanitize=address)
endif ()
if (CHAIVM_ADD_MEM_SANITIZER AND NOT CHAIVM_ADD_THREAD_SANITIZER)
# @todo #37:60min Make address and leak and undefined sanitizer work on MacOS with ARM
target_compile_options(${TARGET_NAME} PRIVATE -fsanitize=address -g -fsanitize=leak -fsanitize=undefined)
target_link_options(${TARGET_NAME} PRIVATE -fsanitize=address -fsanitize=leak -fsanitize=undefined)
elseif(CHAIVM_ADD_THREAD_SANITIZER AND NOT CHAIVM_ADD_MEM_SANITIZER)
# @todo #37:60min Make thread sanitizer work on MacOS with ARM
target_compile_options(${TARGET_NAME} PRIVATE -fsanitize=thread -g)
target_link_options(${TARGET_NAME} PRIVATE -fsanitize=thread)
endif()
add_test(NAME ${TARGET_NAME} COMMAND ./${TARGET_NAME})
endfunction(chai_test)

Expand Down