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 dc1817f3975517d73d326fde0d9ee81acc220c60..3c89d23402693b28558dcc25aab6aa4532ac8eed 100644 (file)
--- 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 b6cb69bc24d0eb2f8633dc51c1cfe9d7309a0909..59a919ae390d7fbe40f6c6988723a2c6948668c6 100644 (file)
--- 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 (executable)
index 0000000..30388b9
--- /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 5955fb1429155e80000c779b6ed7523b64a79a9a..352109cee0191992cad10d9ecb2504b04455a722 100644 (file)
--- 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