From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 18 Mar 2022 18:05:58 +0000 (-0700)
Subject: Use halt_on_error in sanitizer options.
X-Git-Tag: 2.1.0-beta1~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c181987f532e13439489d21b454774b536fb2e;p=thirdparty%2Fzlib-ng.git

Use halt_on_error in sanitizer options.
https://lists.llvm.org/pipermail/cfe-dev/2015-October/045710.html
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 2bf834a7..e7a099a4 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -488,11 +488,11 @@ jobs:
         cd ${{ matrix.build-dir || '.' }}
         ctest --verbose -C Release --output-on-failure --max-width 120 -j ${{ matrix.parallels-jobs || '6' }}
       env:
-        ASAN_OPTIONS: ${{ matrix.asan-options || 'verbosity=0' }}:abort_on_error=1
-        MSAN_OPTIONS: ${{ matrix.msan-options || 'verbosity=0' }}:abort_on_error=1
-        TSAN_OPTIONS: ${{ matrix.tsan-options || 'verbosity=0' }}:abort_on_error=1
-        LSAN_OPTIONS: ${{ matrix.lsan-options || 'verbosity=0' }}:abort_on_error=1
-        UBSAN_OPTIONS: ${{ matrix.ubsan-options || 'verbosity=0' }}:print_stacktrace=1:abort_on_error=1
+        ASAN_OPTIONS: ${{ matrix.asan-options || 'verbosity=0' }}:abort_on_error=1:halt_on_error=1
+        MSAN_OPTIONS: ${{ matrix.msan-options || 'verbosity=0' }}:abort_on_error=1:halt_on_error=1
+        TSAN_OPTIONS: ${{ matrix.tsan-options || 'verbosity=0' }}:abort_on_error=1:halt_on_error=1
+        LSAN_OPTIONS: ${{ matrix.lsan-options || 'verbosity=0' }}:abort_on_error=1:halt_on_error=1
+        UBSAN_OPTIONS: ${{ matrix.ubsan-options || 'verbosity=0' }}:print_stacktrace=1:abort_on_error=1:halt_on_error=1
 
     - name: Generate coverage report
       if: matrix.codecov
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 2ab9d0e5..ce367493 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -239,9 +239,9 @@ jobs:
         make test
       env:
         QEMU_RUN: ${{ matrix.qemu-run }}
-        ASAN_OPTIONS: abort_on_error=1
-        MSAN_OPTIONS: abort_on_error=1
-        UBSAN_OPTIONS: print_stacktrace=1:abort_on_error=1
+        ASAN_OPTIONS: abort_on_error=1:halt_on_error=1
+        MSAN_OPTIONS: abort_on_error=1:halt_on_error=1
+        UBSAN_OPTIONS: print_stacktrace=1:abort_on_error=1:halt_on_error=1
 
     - name: Upload build errors
       uses: actions/upload-artifact@v2