[Valgrind-developers] [valgrind] Solaris: add a configure test for getaddrinfo

[Paul F. <pa...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=b368b44c552d0deb4d0ee77968cb0e8e02a07812

commit b368b44c552d0deb4d0ee77968cb0e8e02a07812
Author: Paul Floyd <pj...@wa...>
Date:   Mon Jul 24 21:32:45 2023 +0200

    Solaris: add a configure test for getaddrinfo
    
    Not available on Solaris 11.3

Diff:
---
 configure.ac                      | 3 +++
 drd/tests/getaddrinfo.vgtest      | 2 +-
 helgrind/tests/Makefile.am        | 5 ++++-
 helgrind/tests/getaddrinfo.vgtest | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4dbb1753c7..b4e9c11428 100755
--- a/configure.ac
+++ b/configure.ac
@@ -4849,6 +4849,7 @@ AC_CHECK_FUNCS([     \
         copy_file_range \
         epoll_create \
         epoll_pwait  \
+        getaddrinfo  \
         klogctl      \
         mallinfo     \
         memchr       \
@@ -4916,6 +4917,8 @@ AM_CONDITIONAL([HAVE_SETCONTEXT], [test x$ac_cv_func_setcontext = xyes])
 AM_CONDITIONAL([HAVE_SWAPCONTEXT], [test x$ac_cv_func_swapcontext = xyes])
 AM_CONDITIONAL([HAVE_MEMFD_CREATE],
                [test x$ac_cv_func_memfd_create = xyes])
+AM_CONDITIONAL([HAVE_GETADDRINFO],
+               [test x$ac_cv_func_getaddrinfo = xyes])
 
 if test x$VGCONF_PLATFORM_PRI_CAPS = xMIPS32_LINUX \
      -o x$VGCONF_PLATFORM_PRI_CAPS = xMIPS64_LINUX \
diff --git a/drd/tests/getaddrinfo.vgtest b/drd/tests/getaddrinfo.vgtest
index 6faa2b6bde..a62baadb92 100644
--- a/drd/tests/getaddrinfo.vgtest
+++ b/drd/tests/getaddrinfo.vgtest
@@ -1,3 +1,3 @@
-prereq: ./supported_libpthread
+prereq: ./supported_libpthread && test -e ../../helgrind/tests/getaddrinfo
 vgopts: -q
 prog: ../../helgrind/tests/getaddrinfo
diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index 13e2d4db66..3e2efad0be 100755
--- a/helgrind/tests/Makefile.am
+++ b/helgrind/tests/Makefile.am
@@ -154,7 +154,6 @@ check_PROGRAMS = \
 	cond_timedwait_invalid \
 	cond_timedwait_test \
 	free_is_write \
-	getaddrinfo \
 	hg01_all_ok \
 	hg02_deadlock \
 	hg03_inherit \
@@ -239,6 +238,10 @@ check_PROGRAMS += annotate_rwlock
 annotate_rwlock_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNUSED_BUT_SET_VARIABLE@
 endif
 
+if HAVE_GETADDRINFO
+check_PROGRAMS += getaddrinfo
+endif
+
 AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
 AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 
diff --git a/helgrind/tests/getaddrinfo.vgtest b/helgrind/tests/getaddrinfo.vgtest
index b58c618887..9543cbd046 100644
--- a/helgrind/tests/getaddrinfo.vgtest
+++ b/helgrind/tests/getaddrinfo.vgtest
@@ -1,2 +1,3 @@
+prereq: test -e getaddrinfo
 prog: getaddrinfo
 vgopts: -q