From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sat, 30 Mar 2024 14:16:55 +0000 (+0100)
Subject: Solaris regtest: fix build of none socket_close
X-Git-Tag: VALGRIND_3_23_0~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=035d6a5d80f3f9d1d1ef431501ccb8752059cb56;p=thirdparty%2Fvalgrind.git

Solaris regtest: fix build of none socket_close

Also add to filter_fdleak
---

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index a37bb2725..185993f20 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -323,6 +323,7 @@ fdleak_cmsg_LDADD	= -lsocket -lnsl
 fdleak_ipv4_LDADD	= -lsocket -lnsl
 fdleak_creat_LDADD	= -lsocket -lnsl
 fdleak_socketpair_LDADD	= -lsocket -lnsl
+socket_close_LDADD	= -lsocket -lnsl
 else
 fcntl_setown_LDADD	= $(AL_LDFLAGS)
 fdleak_cmsg_CFLAGS	= $(AM_CFLAGS)
@@ -330,6 +331,7 @@ fdleak_cmsg_LDADD	= $(AM_LDFLAGS)
 fdleak_ipv4_LDADD	= $(AM_LDFLAGS)
 fdleak_creat_LDADD	= $(AM_LDFLAGS)
 fdleak_socketpair_LDADD	= $(AM_LDFLAGS)
+socket_close_LDADD	= $(AM_LDFLAGS)
 endif
 floored_LDADD 		= -lm
 ifunc_CFLAGS		= $(AM_CFLAGS) -Wno-unused-function
diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak
index 76a6b5b13..ae8afb824 100755
--- a/none/tests/filter_fdleak
+++ b/none/tests/filter_fdleak
@@ -18,6 +18,12 @@ perl -p -e 's/127.0.0.1:[0-9]*/127.0.0.1:.../g' |
 # 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:.../' |
 
+# Solaris specific fdleak filters
+perl -p -e 's/ __close / close /' |
+sed '/ _so_socket /d;' |
+awk '/ socket /{sub(/ by /, " at "); print; next}{print}' |
+awk '/ at .* _syscall6 /{getline; getline; sub(/ by /, " at "); print; next}{print}' |
+
 # Stack traces showing where fds were created have lots of variations:
 # different numbers of entries, line numbers or not depending on whether
 # libc debug info is present, 'main' vs. '(below main)', etc.