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.
sandialabs · Oct 18, 2024 · 034c325 · 034c325
1 parent 62992cd
commit 034c325
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -96,7 +96,9 @@ jobs:
           make -j2
           make tests -j2
       - run:
-          command: timeout --foreground -k 10s 4m make check
+          command: |
+              if [[ "<< parameters.sanitizer >>" == "thread" ]]; then cd test/basics; fi
+              timeout --foreground -k 10s 4m make check
           no_output_timeout: 120s
 
   arm_acfl:
@@ -238,6 +240,24 @@ workflows:
               - scheduler: distrib
                 topology: hwloc
                 sanitizer: memory
+              - scheduler: sherwood
+                topology: no
+                sanitizer: thread
+              - scheduler: sherwood
+                topology: hwloc
+                sanitizer: thread
+              - scheduler: sherwood
+                topology: binders
+                sanitizer: thread
+              - scheduler: distrib
+                topology: no
+                sanitizer: thread
+              - scheduler: distrib
+                topology: hwloc
+                sanitizer: thread
+              - scheduler: distrib
+                topology: binders
+                sanitizer: thread
       - arm_acfl:
           matrix:
             parameters:

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -245,6 +245,10 @@ jobs:
             topology: hwloc
           - sanitizer: memory
             topology: binders
+          - sanitizer: thread
+            scheduler: sherwood
+          - sanitizer: thread
+            scheduler: distrib
     env:
       CC: clang-19
       CXX: clang++-19
@@ -276,7 +280,9 @@ jobs:
         make -j2
         make tests -j2
     - name: make check
-      run: timeout -k 10s --foreground 8m make check
+      run: |
+        if [[ "${{ matrix.sanitizer }}" == "thread" ]]; then cd test/basics; fi
+        timeout -k 10s --foreground 8m make check
       timeout-minutes: 9
 
   linux-thorough: