disabled sanitize with gcc on travis again

nats-io · Jul 15, 2024 · 4154667 · 4154667
1 parent 23e8b68
commit 4154667
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 33 deletions.
diff --git a/.github/workflows/on-pr-debug.yml b/.github/workflows/on-pr-debug.yml
@@ -38,24 +38,23 @@ jobs:
       verbose_test_output: ON
       verbose_make_output: ON
 
-  sanitize-addr:
-    name: "Sanitize address"
+  sanitize:
+    name: "Sanitize"
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [gcc, clang]
+        sanitize: [address, thread]
+        pooled_delivery: [ON, OFF]
     uses: ./.github/workflows/build-test.yml
     with:
-      sanitize: address
       server_version: main
       type: Debug
+      compiler: ${{ matrix.compiler }}
+      sanitize: ${{ matrix.sanitize }}
+      lib_msg_delivery: ${{ matrix.pooled_delivery }}
 
-  sanitize-addr-lib-msg-delivery:
-    name: "Sanitize address (lib_msg_delivery)"
-    uses: ./.github/workflows/build-test.yml
-    with:
-      type: Debug
-      sanitize: address
-      server_version: main
-      lib_msg_delivery: ON
-
-  san-addr:
+  san-addr-deadline:
     name: "Sanitize address (lib_write_deadline)"
     uses: ./.github/workflows/build-test.yml
     with:
@@ -64,14 +63,6 @@ jobs:
       server_version: main
       lib_write_deadline: ON
 
-  san-thread:
-    name: "Sanitize thread"
-    uses: ./.github/workflows/build-test.yml
-    with:
-      type: Debug
-      sanitize: thread
-      server_version: main
-
   Windows:
     name: "Windows"
     runs-on: windows-latest

diff --git a/.travis.yml b/.travis.yml
@@ -122,18 +122,18 @@ jobs:
         - MATRIX_EVAL="CC=gcc-9"
         - NATS_DEFAULT_LIB_WRITE_DEADLINE=2000 BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no"
 
-    - name: "gcc-9 - Default - sanitize thread"
-      compiler: gcc
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: ppa:ubuntu-toolchain-r/test
-          packages:
-            - g++-9
-      env:
-        - MATRIX_EVAL="CC=gcc-9"
-        - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=thread" NATS_TEST_VALGRIND=yes DO_COVERAGE="no"
+    # - name: "gcc-9 - Default - sanitize thread"
+    #   compiler: gcc
+    #   addons:
+    #     apt:
+    #       sources:
+    #         - ubuntu-toolchain-r-test
+    #         - sourceline: ppa:ubuntu-toolchain-r/test
+    #       packages:
+    #         - g++-9
+    #   env:
+    #     - MATRIX_EVAL="CC=gcc-9"
+    #     - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=thread" NATS_TEST_VALGRIND=yes DO_COVERAGE="no"
 
     - name: "clang-8 - TLS OFF"
       compiler: clang