Solaris: add a configure test for getaddrinfo

Not available on Solaris 11.3

diff --git a/configure.ac b/configure.ac
index 4dbb1753c7f52b2508c2266b2b24279c81d22928..b4e9c114286336fd84dec9307d1749498fd0dd86 100755 (executable)
--- 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 6faa2b6bde049fed8a2338936f45d9ca212d7a5a..a62baadb92191ed6c22826fe144197140a8c9bc9 100644 (file)
--- 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 13e2d4db66d1c5774ebf7e82ca658b759a036b98..3e2efad0be3d44ef3f17dd1229101c0d25bfb5a8 100755 (executable)
--- 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 b58c618887f7cd1a6d8d031905c1a5fa74ae9236..9543cbd046d15d59a352e2ef0170dc8dd215bfb9 100644 (file)
--- a/helgrind/tests/getaddrinfo.vgtest
+++ b/helgrind/tests/getaddrinfo.vgtest
@@ -1,2 +1,3 @@
+prereq: test -e getaddrinfo
 prog: getaddrinfo
 vgopts: -q