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 f72cc2720eb266c10b90fa3228b0dc9a8f79b7fa..e05542d818ae10ebeb4bfd19dfa62c62d4d8aeae 100644 (file)
--- 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 2d0036f709184e0d30be6367b280812a99ce63b9..2be15ade9b430816a2a0d17a663fe6de5efe1ad8 100755 (executable)
--- 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 7b4ceb6841f0ebbd60307c293942b0bfac761c05..e0d65cb3d1df1f497c75a50ea131e826036a32d3 100644 (file)
--- 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)
    ...