Skip to content

Commit 8b71a5b

Browse files
authored
Fix long tests: Forbid SAN or TSAN alongside snmalloc (#7173)
1 parent ddde401 commit 8b71a5b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/long-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
git config --global --add safe.directory /__w/CCF/CCF
4646
mkdir build
4747
cd build
48-
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSAN=ON ..
48+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSAN=ON -DUSE_SNMALLOC=OFF ..
4949
ninja
5050
5151
- name: "Test"
@@ -99,7 +99,7 @@ jobs:
9999
git config --global --add safe.directory /__w/CCF/CCF
100100
mkdir build
101101
cd build
102-
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DTSAN=ON -DWORKER_THREADS=2 ..
102+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DTSAN=ON -DUSE_SNMALLOC=OFF -DWORKER_THREADS=2 ..
103103
ninja
104104
105105
- name: "Test"
@@ -211,7 +211,7 @@ jobs:
211211
mkdir build
212212
cd build
213213
# Use libc++ to enable hardening/bounds checking during tests
214-
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DUSE_LIBCXX=ON ..
214+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DUSE_LIBCXX=ON -DUSE_SNMALLOC=OFF ..
215215
ninja
216216
217217
- name: "Test"

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ endif()
138138
if(SAN OR TSAN)
139139
find_program(LLVM_SYMBOLIZER NAMES "llvm-symbolizer")
140140
message(STATUS "Using llvm symbolizer: ${LLVM_SYMBOLIZER}")
141+
142+
if(USE_SNMALLOC)
143+
message(FATAL_ERROR "snmalloc cannot be used with SAN or TSAN")
144+
endif()
141145
endif()
142146

143147
enable_language(ASM)

0 commit comments

Comments
 (0)