From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Wed, 8 May 2024 14:40:36 +0000 (+0200)
Subject: FreeBSD regtest: various fixes for x86 FreeBSD 14.1
X-Git-Tag: VALGRIND_3_24_0~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cf5b8945950204965c2b5bf775b1169a2310935;p=thirdparty%2Fvalgrind.git

FreeBSD regtest: various fixes for x86 FreeBSD 14.1

Most of them are related to the difference between x86 and amd64
syscall ABI.
---

diff --git a/freebsd-drd.supp b/freebsd-drd.supp
index 6995d230b..2f3c8066a 100644
--- a/freebsd-drd.supp
+++ b/freebsd-drd.supp
@@ -263,3 +263,8 @@
    drd:ConflictingAccess
    fun:pthread_once_intercept
 }
+{
+   DRD-FREEBSD141-X86-THR_NEW
+   drd:ConflictingAccess
+   fun:thr_new
+}
diff --git a/memcheck/tests/freebsd/Makefile.am b/memcheck/tests/freebsd/Makefile.am
index 621b96471..dc1817f39 100644
--- a/memcheck/tests/freebsd/Makefile.am
+++ b/memcheck/tests/freebsd/Makefile.am
@@ -3,7 +3,7 @@ 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
+	toucher1 toucher2 filter_getfsstat filter_context filter_frame
 
 EXTRA_DIST = \
 	access.vgtest \
diff --git a/memcheck/tests/freebsd/bug483786.vgtest b/memcheck/tests/freebsd/bug483786.vgtest
index 60cb175cb..942250a84 100644
--- a/memcheck/tests/freebsd/bug483786.vgtest
+++ b/memcheck/tests/freebsd/bug483786.vgtest
@@ -1,2 +1,3 @@
 prog: bug483786
 vgopts: -q
+stderr_filter: filter_frame
diff --git a/memcheck/tests/freebsd/filter_frame b/memcheck/tests/freebsd/filter_frame
new file mode 100755
index 000000000..91766b476
--- /dev/null
+++ b/memcheck/tests/freebsd/filter_frame
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+../filter_stderr "$@" |
+
+gsed 's/frame #2/frame #1/'
diff --git a/memcheck/tests/freebsd/getfsstat.stderr.exp-x86 b/memcheck/tests/freebsd/getfsstat.stderr.exp-x86
index 17751f39a..fb012daa3 100644
--- a/memcheck/tests/freebsd/getfsstat.stderr.exp-x86
+++ b/memcheck/tests/freebsd/getfsstat.stderr.exp-x86
@@ -1,6 +1,6 @@
 Syscall param getfsstat(buf) points to unaddressable byte(s)
    at 0x........: _getfsstat (in /...libc...)
-   by 0x........: getfsstat (in /...libc...)
+   by 0x........: _getfsstat (in /...libc...)
    by 0x........: main (getfsstat.c:25)
  Address 0x........ is 0 bytes inside a block of size 2,344 free'd
    at 0x........: free (vg_replace_malloc.c:...)
@@ -11,11 +11,11 @@ Syscall param getfsstat(buf) points to unaddressable byte(s)
 
 Syscall param getfsstat(len) contains uninitialised byte(s)
    at 0x........: _getfsstat (in /...libc...)
-   by 0x........: getfsstat (in /...libc...)
+   by 0x........: _getfsstat (in /...libc...)
    by 0x........: main (getfsstat.c:30)
 
 Syscall param getfsstat(flags) contains uninitialised byte(s)
    at 0x........: _getfsstat (in /...libc...)
-   by 0x........: getfsstat (in /...libc...)
+   by 0x........: _getfsstat (in /...libc...)
    by 0x........: main (getfsstat.c:31)
 
diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak
index a558021dc..f7cb026ed 100755
--- a/none/tests/filter_fdleak
+++ b/none/tests/filter_fdleak
@@ -21,6 +21,8 @@ perl -p -e "s/: open \(/: creat (/" |
 
 # FreeBSD specific fdleak filters
 perl -p -e 's/ _close / close /;s/ _openat / creat /;s/internet/AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:.../' |
+sed '/by 0x........: close (in \/...libc...)/d' |
+sed '/by 0x........: creat (in \/...libc...)/d' |
 
 # Solaris specific fdleak filters
 perl -p -e 's/ __close / close /' |