FreeBSD regtest: updates for FreeBSD 15.0-CURRENT

Mostly minor expected/filter changes.

Helgrind did detect a race condition in a Valgrind file static
variable. Teh DRD dlopen test needs to be linked with the thread library.

In a VirtualBox environment I'm getting 4 hanging testcases
(3 in gdbserver_tests and none/freebsd/bug452274).

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index e2030ad157df314382ef835354364a455b4b9634..7fa1611a97b7dddb7006f19553ea23dfa32769df 100755 (executable)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -550,7 +550,9 @@ bug322621_SOURCES           = bug322621.cpp
 condvar_SOURCES                    = condvar.cpp
 condvar_CXXFLAGS            = $(AM_CXXFLAGS) -std=c++0x
 concurrent_close_SOURCES    = concurrent_close.cpp
-if !VGCONF_OS_IS_FREEBSD
+if VGCONF_OS_IS_FREEBSD
+dlopen_main_LDADD           = ${LDADD}
+else
 dlopen_main_LDADD           = -ldl
 endif
 dlopen_lib_so_SOURCES       = dlopen_lib.c

diff --git a/freebsd-helgrind.supp b/freebsd-helgrind.supp
index dd998f15c5297faec591fa718833e369112b2b9e..1a6f372492ec8684c044e64b553d24fc1a84b51c 100644 (file)
--- a/freebsd-helgrind.supp
+++ b/freebsd-helgrind.supp
@@ -238,4 +238,9 @@
    Helgrind:Race
    fun:thr_exit
 }
-
+# sigh, this is our own variable in coregrind/m_replacemalloc/vg_replace_malloc.c
+{
+   FREEBSD15-AMD64-MALLOC
+   Helgrind:Race
+   fun:malloc
+}

diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index 817e08a72832794092926ab5dc0b772f55be32dc..b8c5fd0e782e70fc6c93064a9dbfc252ca6305cc 100755 (executable)
--- a/helgrind/tests/Makefile.am
+++ b/helgrind/tests/Makefile.am
@@ -5,6 +5,7 @@ dist_noinst_SCRIPTS = \
                      filter_stderr_solaris \
                      filter_helgrind \
                      filter_xml \
+                      filter_fiw \
                      filter_freebsd.awk \
                      filter_stderr_freebsd \
                      filter_bug392331

diff --git a/helgrind/tests/filter_fiw b/helgrind/tests/filter_fiw
new file mode 100755 (executable)
index 0000000..9ff7ae7
--- /dev/null
+++ b/helgrind/tests/filter_fiw
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+# free_is_write may have different arena sizes 
+
+./filter_stderr "$@" |
+
+sed 's/size [^ ]* in arena/size ... in arena/'
+   

diff --git a/helgrind/tests/free_is_write.stderr.exp b/helgrind/tests/free_is_write.stderr.exp
index daa327ce013cd17614eeabd823eb754fe82a00ef..5d05242aca7ba96d38b4b29bf5136974762dd275 100644 (file)
--- a/helgrind/tests/free_is_write.stderr.exp
+++ b/helgrind/tests/free_is_write.stderr.exp
@@ -23,7 +23,7 @@ Locks held: none
 This conflicts with a previous read of size 1 by thread #x
 Locks held: none
    at 0x........: main (free_is_write.c:36)
- Address 0x........ is 5 bytes inside an unallocated block of size 16 in arena "client"
+ Address 0x........ is 5 bytes inside an unallocated block of size ... in arena "client"
 
 Done.
 

diff --git a/helgrind/tests/free_is_write.vgtest b/helgrind/tests/free_is_write.vgtest
index 5ba9d3423ee77288c1dd8c961eb84cb7721305e3..1e68c6054e6aa100a6baf7a3e8876acb9f8548bf 100644 (file)
--- a/helgrind/tests/free_is_write.vgtest
+++ b/helgrind/tests/free_is_write.vgtest
@@ -1,2 +1,3 @@
 prog: free_is_write
 vgopts: --free-is-write=yes
+stderr_filter: filter_fiw

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index eb3b6f9ee03b124910cb72af71e6d58b831e0de2..928ac16e6ae57e182d4f5f872ee944775668898a 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -86,6 +86,7 @@ dist_noinst_SCRIPTS = \
        filter_varinfo3 \
        filter_memcheck \
        filter_malloc_free \
+       filter_sendmsg \
        filter_size_t \
        filter_stanza \
        filter_stanza.awk \
@@ -385,7 +386,6 @@ EXTRA_DIST = \
        sem.stderr.exp sem.vgtest \
        sendmsg.stderr.exp sendmsg.stderr.exp-solaris sendmsg.vgtest \
            sendmsg.stderr.exp-freebsd \
-           sendmsg.stderr.exp-freebsd-x86 \
        sh-mem.stderr.exp sh-mem.vgtest \
        sh-mem-random.stderr.exp sh-mem-random.stdout.exp64 \
        sh-mem-random.stdout.exp sh-mem-random.vgtest \

diff --git a/memcheck/tests/filter_sendmsg b/memcheck/tests/filter_sendmsg
new file mode 100755 (executable)
index 0000000..c11650d
--- /dev/null
+++ b/memcheck/tests/filter_sendmsg
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+./filter_stderr "$@" |
+sed -e "s/frame #./frame #.../" \
+    -e "/by 0x........: sendmsg (in \/...libc...)/d"

diff --git a/memcheck/tests/sendmsg.stderr.exp b/memcheck/tests/sendmsg.stderr.exp
index 397a57996cb9daba1400f2336409000712b65dfc..1268300b2bcadbedad854524a5e8dc4455a74c39 100644 (file)
--- a/memcheck/tests/sendmsg.stderr.exp
+++ b/memcheck/tests/sendmsg.stderr.exp
@@ -2,6 +2,6 @@ Syscall param sendmsg(msg) points to uninitialised byte(s)
    at 0x........: sendmsg (in /...libc...)
    by 0x........: main (sendmsg.c:46)
  Address 0x........ is on thread 1's stack
- in frame #1, created by main (sendmsg.c:13)
+ in frame #..., created by main (sendmsg.c:13)
 
 sendmsg: 6

diff --git a/memcheck/tests/sendmsg.stderr.exp-freebsd b/memcheck/tests/sendmsg.stderr.exp-freebsd
index 7cf17e625ecb5c69776898fdf65e74030f955fb0..d65f86f055a0e99a194b913431006363704573bd 100644 (file)
--- a/memcheck/tests/sendmsg.stderr.exp-freebsd
+++ b/memcheck/tests/sendmsg.stderr.exp-freebsd
@@ -2,19 +2,18 @@ Syscall param socketcall.connect(serv_addr.sa_len) points to uninitialised byte(
    ...
    by 0x........: main (sendmsg.c:29)
  Address 0x........ is on thread 1's stack
- in frame #1, created by main (sendmsg.c:13)
+ in frame #..., created by main (sendmsg.c:13)
 
 Syscall param sendmsg(sendmsg) points to uninitialised byte(s)
    at 0x........: _sendmsg (in /...libc...)
-   by 0x........: sendmsg (in /...libc...)
    by 0x........: main (sendmsg.c:46)
  Address 0x........ is on thread 1's stack
- in frame #2, created by main (sendmsg.c:13)
+ in frame #..., created by main (sendmsg.c:13)
 
 Syscall param socketcall.connect(serv_addr.sa_len) points to uninitialised byte(s)
    ...
    by 0x........: main (sendmsg.c:59)
  Address 0x........ is on thread 1's stack
- in frame #1, created by main (sendmsg.c:13)
+ in frame #..., created by main (sendmsg.c:13)
 
 sendmsg: 6

diff --git a/memcheck/tests/sendmsg.stderr.exp-freebsd-x86 b/memcheck/tests/sendmsg.stderr.exp-freebsd-x86
deleted file mode 100644 (file)
index 9aafb02..0000000
--- a/memcheck/tests/sendmsg.stderr.exp-freebsd-x86
+++ /dev/null
@@ -1,20 +0,0 @@
-Syscall param socketcall.connect(serv_addr.sa_len) points to uninitialised byte(s)
-   ...
-   by 0x........: main (sendmsg.c:29)
- Address 0x........ is on thread 1's stack
- in frame #2, created by main (sendmsg.c:13)
-
-Syscall param sendmsg(sendmsg) points to uninitialised byte(s)
-   at 0x........: _sendmsg (in /...libc...)
-   by 0x........: sendmsg (in /...libc...)
-   by 0x........: main (sendmsg.c:46)
- Address 0x........ is on thread 1's stack
- in frame #2, created by main (sendmsg.c:13)
-
-Syscall param socketcall.connect(serv_addr.sa_len) points to uninitialised byte(s)
-   ...
-   by 0x........: main (sendmsg.c:59)
- Address 0x........ is on thread 1's stack
- in frame #2, created by main (sendmsg.c:13)
-
-sendmsg: 6

diff --git a/memcheck/tests/sendmsg.stderr.exp-solaris b/memcheck/tests/sendmsg.stderr.exp-solaris
index f00e76e40250a0db173447ced6feee20f5c1ddf8..3ef45c16adf7589230e3d8c8e4ab8a98215e09c3 100644 (file)
--- a/memcheck/tests/sendmsg.stderr.exp-solaris
+++ b/memcheck/tests/sendmsg.stderr.exp-solaris
@@ -3,6 +3,6 @@ Syscall param sendmsg(msg) points to uninitialised byte(s)
    by 0x........: __xnet_sendmsg (in /...libc...)
    by 0x........: main (sendmsg.c:46)
  Address 0x........ is on thread 1's stack
- in frame #2, created by main (sendmsg.c:13)
+ in frame #..., created by main (sendmsg.c:13)
 
 sendmsg: 6

diff --git a/memcheck/tests/sendmsg.vgtest b/memcheck/tests/sendmsg.vgtest
index f252b62b952ee071ccc7686bd02ab153f401eae5..562fc968fe39bc7b4952846aa987e947548e6875 100644 (file)
--- a/memcheck/tests/sendmsg.vgtest
+++ b/memcheck/tests/sendmsg.vgtest
@@ -1,2 +1,3 @@
 prog: sendmsg
 vgopts: -q
+stderr_filter: filter_sendmsg

diff --git a/none/tests/fdleak_cmsg_supp.supp b/none/tests/fdleak_cmsg_supp.supp
index 95f0a31de6db36f50f4a84aaeb14ac683cdd7432..cc0daca1874c0e3ca30114267fdd991c578fa5a5 100644 (file)
--- a/none/tests/fdleak_cmsg_supp.supp
+++ b/none/tests/fdleak_cmsg_supp.supp
@@ -52,7 +52,7 @@
    sup5
    CoreError:FdNotClosed
    ...
-   fun:recvmsg
+   fun:*recvmsg
    fun:client
    fun:main
 }