From da97afefcac37fe282bab451470bc8b375332a48 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Wed, 10 Feb 2021 14:21:08 +0100
Subject: [PATCH] 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)
---
 .gitlab-ci.yml        | 4 ++--
 tsan-suppressions.txt | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 tsan-suppressions.txt

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8c53ec820..4347570ce1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1023,7 +1023,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:
@@ -1050,7 +1050,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
index 0000000000..b12e03892f
--- /dev/null
+++ b/tsan-suppressions.txt
@@ -0,0 +1,2 @@
+# Uninstrumented library.
+called_from_lib:libfstrm.so