File 5932-kernel-net-test-Tweaked-tc-for-Solaris.patch of Package erlang
From 57945d639415b08f80be06b20fc3b171e86667df Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 3 Sep 2024 10:51:31 +0200
Subject: [PATCH 2/3] [kernel|net|test] Tweaked tc for Solaris
---
lib/kernel/test/net_SUITE.erl | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/lib/kernel/test/net_SUITE.erl b/lib/kernel/test/net_SUITE.erl
index a19666dd1a..c6bcf8cc4a 100644
--- a/lib/kernel/test/net_SUITE.erl
+++ b/lib/kernel/test/net_SUITE.erl
@@ -423,8 +423,10 @@ api_b_getservbyname() ->
wrong_port("snmp", tcp, WrongPort, 161);
{error, Reason} ->
case os:type() of
- {unix, openbsd}
- when (Reason =:= einval) ->
+ {unix, Flavor}
+ when ((Flavor =:= openbsd) orelse
+ (Flavor =:= solaris)) andalso
+ (Reason =:= einval) ->
ok;
_ ->
?P("Unexpected failure: ~p",
@@ -583,7 +585,12 @@ api_b_getservbyport() ->
end
end
end),
- {ok, "snmp"} = net:getservbyport(161, udp),
+ case net:getservbyport(161, udp) of
+ {ok, "snmp"} ->
+ ok;
+ {ok, "snmpd"} -> %% Solaris
+ ok
+ end,
not_on_windows(fun() ->
case net:getservbyport(161, tcp) of
{ok, "snmp"} ->
@@ -593,8 +600,10 @@ api_b_getservbyport() ->
WrongService, "snmp");
{error, Reason} ->
case os:type() of
- {unix, openbsd}
- when (Reason =:= einval) ->
+ {unix, Flavor}
+ when ((Flavor =:= openbsd) orelse
+ (Flavor =:= solaris)) andalso
+ (Reason =:= einval) ->
ok;
_ ->
?P("Unexpected failure: ~p",
--
2.43.0