OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix ip::tcp::resolver test failure on Solaris

Browse Source 
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.

(cherry picked from commit 48b20d46f9)
This commit is contained in:
Jonathan Wakely 2021-08-31 13:08:23 +01:00
parent b7e73951fd
commit 6d51766a55
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libstdc++-v3/testsuite/experimental/net/internet/resolver/ops/lookup.cc
View File

@ -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 );