From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 80AAB3858D3C; Tue, 12 Oct 2021 19:41:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80AAB3858D3C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-9142] libstdc++: Fix ip::tcp::resolver test failure on Solaris X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: b7e73951fd15f07946ff0c56f4e31b0006c621f9 X-Git-Newrev: 6d51766a558fac78f294031d4bf5b8b6d390aa9b Message-Id: <20211012194143.80AAB3858D3C@sourceware.org> Date: Tue, 12 Oct 2021 19:41:43 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Oct 2021 19:41:43 -0000 https://gcc.gnu.org/g:6d51766a558fac78f294031d4bf5b8b6d390aa9b commit r11-9142-g6d51766a558fac78f294031d4bf5b8b6d390aa9b Author: Jonathan Wakely Date: Tue Aug 31 13:08:23 2021 +0100 libstdc++: Fix ip::tcp::resolver test failure on Solaris Solaris 11 does not have "http" in /etc/services, which causes this test to fail. Try some other services until we find one that works. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * testsuite/experimental/net/internet/resolver/ops/lookup.cc: Try other service if "http" fails. (cherry picked from commit 48b20d46f9597a4b1e19e0e2d4a0c68d056d7662) Diff: --- .../experimental/net/internet/resolver/ops/lookup.cc | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/testsuite/experimental/net/internet/resolver/ops/lookup.cc b/libstdc++-v3/testsuite/experimental/net/internet/resolver/ops/lookup.cc index ca8f0899ccd..69be194fa29 100644 --- a/libstdc++-v3/testsuite/experimental/net/internet/resolver/ops/lookup.cc +++ b/libstdc++-v3/testsuite/experimental/net/internet/resolver/ops/lookup.cc @@ -30,13 +30,27 @@ test01() std::error_code ec; io_context ctx; ip::tcp::resolver resolv(ctx); - auto addrs = resolv.resolve("localhost", "http", ec); + auto hostname = "localhost", service = "http"; + auto addrs = resolv.resolve(hostname, service, ec); + if (ec == ip::resolver_errc::service_not_found) + { + // Solaris doesn't have http in /etc/services, try some others. + for (auto serv : {"ftp", "telnet", "smtp"}) + { + addrs = resolv.resolve(hostname, serv, ec); + if (!ec) + { + service = serv; + break; + } + } + } VERIFY( !ec ); VERIFY( addrs.size() > 0 ); VERIFY( addrs.begin() != addrs.end() ); VERIFY( ! addrs.empty() ); - auto addrs2 = resolv.resolve("localhost", "http"); + auto addrs2 = resolv.resolve(hostname, service); VERIFY( addrs == addrs2 ); } @@ -68,7 +82,7 @@ test02() #if __cpp_exceptions bool caught = false; try { - resolv.resolve("localhost", "http", flags); + resolv.resolve("localhost", "42", flags); } catch (const std::system_error& e) { caught = true; VERIFY( e.code() == ec );