Skip to content

Commit 46a7d58

Browse files
committed
remove extra flags for tsan
1 parent 0784e14 commit 46a7d58

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

.github/workflows/ubuntu.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -556,44 +556,34 @@ jobs:
556556
PPC_NUM_PROC: 2
557557
PPC_NUM_THREADS: 2
558558
PPC_ASAN_RUN: 1
559-
ASAN_OPTIONS: abort_on_error=1
560-
UBSAN_OPTIONS: halt_on_error=1
561559
TSAN_OPTIONS: ignore_noninstrumented_modules=1
562560
- name: Run tests (threads, num_threads=1)
563561
run: python3 scripts/run_tests.py --running-type="threads"
564562
env:
565563
PPC_NUM_PROC: 1
566564
PPC_NUM_THREADS: 1
567565
PPC_ASAN_RUN: 1
568-
ASAN_OPTIONS: abort_on_error=1
569-
UBSAN_OPTIONS: halt_on_error=1
570566
TSAN_OPTIONS: ignore_noninstrumented_modules=1
571567
- name: Run tests (threads, num_threads=2)
572568
run: python3 scripts/run_tests.py --running-type="threads"
573569
env:
574570
PPC_NUM_PROC: 1
575571
PPC_NUM_THREADS: 2
576572
PPC_ASAN_RUN: 1
577-
ASAN_OPTIONS: abort_on_error=1
578-
UBSAN_OPTIONS: halt_on_error=1
579573
TSAN_OPTIONS: ignore_noninstrumented_modules=1
580574
- name: Run tests (threads, num_threads=3)
581575
run: python3 scripts/run_tests.py --running-type="threads"
582576
env:
583577
PPC_NUM_PROC: 1
584578
PPC_NUM_THREADS: 3
585579
PPC_ASAN_RUN: 1
586-
ASAN_OPTIONS: abort_on_error=1
587-
UBSAN_OPTIONS: halt_on_error=1
588580
TSAN_OPTIONS: ignore_noninstrumented_modules=1
589581
- name: Run tests (threads, num_threads=4)
590582
run: python3 scripts/run_tests.py --running-type="threads"
591583
env:
592584
PPC_NUM_PROC: 1
593585
PPC_NUM_THREADS: 4
594586
PPC_ASAN_RUN: 1
595-
ASAN_OPTIONS: abort_on_error=1
596-
UBSAN_OPTIONS: halt_on_error=1
597587
TSAN_OPTIONS: ignore_noninstrumented_modules=1
598588
ubuntu-clang-sanitizer-test-extended:
599589
needs:

cmake/sanitizers.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
1414
add_compile_options(-fsanitize=leak)
1515
add_link_options(-fsanitize=leak)
1616
message(STATUS "Enabled leak sanitizer")
17+
endif()
1718
if (ENABLE_THREAD_SANITIZER)
1819
add_compile_options(-fsanitize=thread)
1920
add_link_options(-fsanitize=thread)

0 commit comments

Comments
 (0)