diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2021-08-31 13:08:23 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2021-08-31 17:36:11 +0100 |
commit | 48b20d46f9597a4b1e19e0e2d4a0c68d056d7662 (patch) | |
tree | 5822d2ef5c6002786bf7f7b80f687582363742d5 | |
parent | 863d6524f320abe14d6993fec188e787470e69b6 (diff) | |
download | gcc-48b20d46f9597a4b1e19e0e2d4a0c68d056d7662.zip gcc-48b20d46f9597a4b1e19e0e2d4a0c68d056d7662.tar.gz gcc-48b20d46f9597a4b1e19e0e2d4a0c68d056d7662.tar.bz2 |
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 <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
* testsuite/experimental/net/internet/resolver/ops/lookup.cc:
Try other service if "http" fails.
-rw-r--r-- | libstdc++-v3/testsuite/experimental/net/internet/resolver/ops/lookup.cc | 20 |
1 files 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 ca8f089..69be194 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 ); |