From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sun, 9 Jun 2024 15:13:42 +0000 (+0200)
Subject: FreeBSD regtest: add filter for FreeBSD 14.1 conditional error
X-Git-Tag: VALGRIND_3_24_0~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a36fd14666ea4016ce8821d376df2cc98619499;p=thirdparty%2Fvalgrind.git

FreeBSD regtest: add filter for FreeBSD 14.1 conditional error
---

diff --git a/memcheck/tests/freebsd/Makefile.am b/memcheck/tests/freebsd/Makefile.am
index dc1817f39..3c89d2340 100644
--- a/memcheck/tests/freebsd/Makefile.am
+++ b/memcheck/tests/freebsd/Makefile.am
@@ -3,7 +3,8 @@ include $(top_srcdir)/Makefile.tool-tests.am
 
 dist_noinst_SCRIPTS = filter_stderr filter_pts dump_stdout filter_sigwait \
 	filter_scalar filter_realpathat filter_fstat filter_eventfd2 \
-	toucher1 toucher2 filter_getfsstat filter_context filter_frame
+	toucher1 toucher2 filter_getfsstat filter_context filter_frame \
+	filter_supp
 
 EXTRA_DIST = \
 	access.vgtest \
diff --git a/memcheck/tests/freebsd/aligned_allocs_supp.vgtest b/memcheck/tests/freebsd/aligned_allocs_supp.vgtest
index b6cb69bc2..59a919ae3 100644
--- a/memcheck/tests/freebsd/aligned_allocs_supp.vgtest
+++ b/memcheck/tests/freebsd/aligned_allocs_supp.vgtest
@@ -1,4 +1,5 @@
 prog: errno_aligned_allocs
 vgopts: --suppressions=aligned_allocs_supp.supp -s
+stderr_filter: filter_supp
 
 
diff --git a/memcheck/tests/freebsd/filter_supp b/memcheck/tests/freebsd/filter_supp
new file mode 100755
index 000000000..30388b9bb
--- /dev/null
+++ b/memcheck/tests/freebsd/filter_supp
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+../filter_stderr "$@" |
+
+gsed '/MEMCHECK-RTLD-COND/d'
+
+exit 0
diff --git a/memcheck/tests/freebsd/memalign_supp.vgtest b/memcheck/tests/freebsd/memalign_supp.vgtest
index 5955fb142..352109cee 100644
--- a/memcheck/tests/freebsd/memalign_supp.vgtest
+++ b/memcheck/tests/freebsd/memalign_supp.vgtest
@@ -1,2 +1,3 @@
 prog: memalign
 vgopts: -s --suppressions=memalign_supp.supp
+stderr_filter: filter_supp