Skip to content

Commit 034c325

Browse files
Skip thread sanitizer tests that currently don't pass due to lack of sanitizer interop in the threadqueues. It's better to at least test what we have working to avoid regressions.
1 parent 62992cd commit 034c325

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

.circleci/config.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ jobs:
9696
make -j2
9797
make tests -j2
9898
- run:
99-
command: timeout --foreground -k 10s 4m make check
99+
command: |
100+
if [[ "<< parameters.sanitizer >>" == "thread" ]]; then cd test/basics; fi
101+
timeout --foreground -k 10s 4m make check
100102
no_output_timeout: 120s
101103

102104
arm_acfl:
@@ -238,6 +240,24 @@ workflows:
238240
- scheduler: distrib
239241
topology: hwloc
240242
sanitizer: memory
243+
- scheduler: sherwood
244+
topology: no
245+
sanitizer: thread
246+
- scheduler: sherwood
247+
topology: hwloc
248+
sanitizer: thread
249+
- scheduler: sherwood
250+
topology: binders
251+
sanitizer: thread
252+
- scheduler: distrib
253+
topology: no
254+
sanitizer: thread
255+
- scheduler: distrib
256+
topology: hwloc
257+
sanitizer: thread
258+
- scheduler: distrib
259+
topology: binders
260+
sanitizer: thread
241261
- arm_acfl:
242262
matrix:
243263
parameters:

.github/workflows/CI.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ jobs:
245245
topology: hwloc
246246
- sanitizer: memory
247247
topology: binders
248+
- sanitizer: thread
249+
scheduler: sherwood
250+
- sanitizer: thread
251+
scheduler: distrib
248252
env:
249253
CC: clang-19
250254
CXX: clang++-19
@@ -276,7 +280,9 @@ jobs:
276280
make -j2
277281
make tests -j2
278282
- name: make check
279-
run: timeout -k 10s --foreground 8m make check
283+
run: |
284+
if [[ "${{ matrix.sanitizer }}" == "thread" ]]; then cd test/basics; fi
285+
timeout -k 10s --foreground 8m make check
280286
timeout-minutes: 9
281287

282288
linux-thorough:

0 commit comments

Comments
 (0)