From d7daab3bc86ffe234ed696b9376693098b7bd720 Mon Sep 17 00:00:00 2001 From: Jelle Foks Date: Tue, 4 Feb 2025 15:41:44 -0800 Subject: [PATCH] Allowances for localhost not resolving --- starboard/android/shared/test_filters.py | 1 + starboard/nplb/posix_compliance/posix_socket_resolve_test.cc | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/starboard/android/shared/test_filters.py b/starboard/android/shared/test_filters.py index c25b08ed076..05c66f29fb5 100644 --- a/starboard/android/shared/test_filters.py +++ b/starboard/android/shared/test_filters.py @@ -54,6 +54,7 @@ # This test is failing because localhost is not defined for IPv6 in # /etc/hosts. 'SbSocketAddressTypes/SbSocketResolveTest.Localhost/filter_ipv6_type_ipv6', + 'PosixSocketHints/PosixSocketResolveTest.Localhost/family_inet6_*', # SbDirectory has problems with empty Asset dirs. 'SbDirectoryCanOpenTest.SunnyDayStaticContent', diff --git a/starboard/nplb/posix_compliance/posix_socket_resolve_test.cc b/starboard/nplb/posix_compliance/posix_socket_resolve_test.cc index d8d86a07d56..8a0320aed2c 100644 --- a/starboard/nplb/posix_compliance/posix_socket_resolve_test.cc +++ b/starboard/nplb/posix_compliance/posix_socket_resolve_test.cc @@ -213,8 +213,9 @@ TEST_P(PosixSocketResolveTest, Localhost) { int result = getaddrinfo(kLocalhost, 0, &hints, &ai); #if SB_API_VERSION < 16 - if (result == EAI_BADFLAGS && GetAddressFamily() == AF_INET6) { - // It's ok to return EAI_BADFLAGS for IPv6 on Starboard < 16. + if ((result == EAI_BADFLAGS || result == EAI_NODATA) && + GetAddressFamily() == AF_INET6) { + // It's ok to return EAI_BADFLAGS or EAI_NODATA for IPv6 on Starboard < 16. freeaddrinfo(ai); return; }