]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix external_symbolizer_path on Fedora
authorMichal Nowak <mnowak@isc.org>
Wed, 15 Jun 2022 17:05:56 +0000 (19:05 +0200)
committerMichal Nowak <mnowak@isc.org>
Thu, 16 Jun 2022 15:21:12 +0000 (17:21 +0200)
The external_symbolizer_path was wrong on Fedora since moving gcc:tsan
jobs from Debian to Fedora.

.gitlab-ci.yml

index dae66ce2881dfcb7cc1360711188b25034640c52..b2637808179199eb91fd7894d4f30289ca19172b 100644 (file)
@@ -25,7 +25,7 @@ variables:
 
   # Pass run-time flags to AddressSanitizer to get core dumps on error.
   ASAN_OPTIONS: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
-  TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer"
+  TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan"
 
   TARBALL_EXTENSION: xz
 
@@ -986,7 +986,7 @@ gcc:tsan:
 system:gcc:tsan:
   variables:
     SOFTHSM2_MODULE: "/lib64/libsofthsm2.so"
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
   <<: *fedora_35_amd64_image
   <<: *system_test_tsan_job
   needs:
@@ -995,7 +995,7 @@ system:gcc:tsan:
 
 unit:gcc:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
   <<: *fedora_35_amd64_image
   <<: *unit_test_tsan_job
   needs:
@@ -1013,7 +1013,7 @@ clang:tsan:
 
 system:clang:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer"
   <<: *base_image
   <<: *system_test_tsan_job
   needs:
@@ -1022,7 +1022,7 @@ system:clang:tsan:
 
 unit:clang:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt"
   <<: *base_image
   <<: *unit_test_tsan_job
   needs: