Suppress TSAN errors from libfstrm.so

dnstap_test produces TSAN errors which originate in libfstrm.so. Unless
libfstrm is TSAN clean or a workaround is placed in libfstrm sources,
suppressing TSAN coming from libfstrm is necessary to test DNSTAP under
TSAN.

(cherry picked from commit c97c6fbfea2a58e95ef58c13b9aec07501496a9e)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa8b8a63b9ee1961852b6d237b7ad3affd93ab8e..5c02c62872f883bd589dad88e81f8267736c42f8 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -982,7 +982,7 @@ system:gcc:tsan:
 
 unit:gcc:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt
   <<: *base_image
   <<: *unit_test_tsan_job
   needs:
@@ -1009,7 +1009,7 @@ system:clang:tsan:
 
 unit:clang:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt
   <<: *base_image
   <<: *unit_test_tsan_job
   needs:

diff --git a/tsan-suppressions.txt b/tsan-suppressions.txt
new file mode 100644 (file)
index 0000000..b12e038
--- /dev/null
+++ b/tsan-suppressions.txt
@@ -0,0 +1,2 @@
+# Uninstrumented library.
+called_from_lib:libfstrm.so