From 7a36fd14666ea4016ce8821d376df2cc98619499 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Sun, 9 Jun 2024 17:13:42 +0200 Subject: [PATCH] FreeBSD regtest: add filter for FreeBSD 14.1 conditional error --- memcheck/tests/freebsd/Makefile.am | 3 ++- memcheck/tests/freebsd/aligned_allocs_supp.vgtest | 1 + memcheck/tests/freebsd/filter_supp | 7 +++++++ memcheck/tests/freebsd/memalign_supp.vgtest | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100755 memcheck/tests/freebsd/filter_supp diff --git a/memcheck/tests/freebsd/Makefile.am b/memcheck/tests/freebsd/Makefile.am index dc1817f397..3c89d23402 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 b6cb69bc24..59a919ae39 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 0000000000..30388b9bb1 --- /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 5955fb1429..352109cee0 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 -- 2.47.2