From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Fri, 10 Dec 2021 20:34:02 +0000 (+0100)
Subject: FreeBSD scalar - filter didn't account for padding
X-Git-Tag: VALGRIND_3_19_0~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a56881fd7d0b75fe9b1221bed7c3aeb4ab9b862a;p=thirdparty%2Fvalgrind.git

FreeBSD scalar - filter didn't account for padding

Also forgot to remove deleted expected from EXTRA_DIST
---

diff --git a/memcheck/tests/freebsd/Makefile.am b/memcheck/tests/freebsd/Makefile.am
index f72cc2720e..e05542d818 100644
--- a/memcheck/tests/freebsd/Makefile.am
+++ b/memcheck/tests/freebsd/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST = \
 	scalar.vgtest \
 	scalar.stderr.exp \
 		scalar.stderr.exp-x86 \
-		scalar.stderr.exp-freebsd130 \
 		scalar.stderr.exp-freebsd130-x86 \
 	capsicum.vgtest \
 	capsicum.stderr.exp \
diff --git a/memcheck/tests/freebsd/filter_scalar b/memcheck/tests/freebsd/filter_scalar
index 2d0036f709..2be15ade9b 100755
--- a/memcheck/tests/freebsd/filter_scalar
+++ b/memcheck/tests/freebsd/filter_scalar
@@ -13,4 +13,4 @@ sed '/at 0x........: syscall (in \/...libc...)/d' |
 
 # filter differences between FreeBSD 12 and 13/14
 
-sed 's/_freebsd12//'
+sed 's/SYS_freebsd12/          SYS/'
diff --git a/memcheck/tests/freebsd/scalar.stderr.exp b/memcheck/tests/freebsd/scalar.stderr.exp
index 7b4ceb6841..e0d65cb3d1 100644
--- a/memcheck/tests/freebsd/scalar.stderr.exp
+++ b/memcheck/tests/freebsd/scalar.stderr.exp
@@ -3782,7 +3782,7 @@ Syscall param thr_kill2(sig) contains uninitialised byte(s)
    ...
 
 ---------------------------------------------------------
-482:  SYS_shm_open (SHM_ANON) 3s 0m
+482:            SYS_shm_open (SHM_ANON) 3s 0m
 ---------------------------------------------------------
 Syscall param shm_open(path) contains uninitialised byte(s)
    ...
@@ -4242,7 +4242,7 @@ Syscall param jail_remove(jid) contains uninitialised byte(s)
    ...
 
 ---------------------------------------------------------
-509: SYS_closefrom 1s 0m
+509:           SYS_closefrom 1s 0m
 ---------------------------------------------------------
 Syscall param closefrom(lowfd) contains uninitialised byte(s)
    ...