Skip to content

Commit b40d9ef

Browse files
bmkbmk
committed
Merge branch 'bmk/kernel/20260317/test_tweaking'
2 parents ca2849d + 52ef1d1 commit b40d9ef

4 files changed

Lines changed: 74 additions & 18 deletions

File tree

‎lib/kernel/test/gen_sctp_SUITE.erl‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1955,7 +1955,7 @@ send_block(Config) when is_list(Config) ->
19551955

19561956
%% Test opening a multihoming ipv4 socket.
19571957
open_multihoming_ipv4_socket(Config) when is_list(Config) ->
1958-
?P("get addrs by family (inet)"),
1958+
?P("~s -> get addrs by family (inet, 2)", [?FUNCTION_NAME]),
19591959
case get_addrs_by_family(inet, 2) of
19601960
{ok, [Addr1, Addr2]} ->
19611961
?P("got addrs: "
@@ -1972,8 +1972,11 @@ open_multihoming_ipv4_socket(Config) when is_list(Config) ->
19721972
%% non-working ipv6 setup. Test opening a unihoming (non-multihoming)
19731973
%% ipv6 socket.
19741974
open_unihoming_ipv6_socket(Config) when is_list(Config) ->
1975+
?P("~s -> get addrs by family (inet6, 1)", [?FUNCTION_NAME]),
19751976
case get_addrs_by_family(inet6, 1) of
19761977
{ok, [Addr]} ->
1978+
?P("got addr: "
1979+
"~n Addr: ~p", [Addr]),
19771980
do_open_and_connect([Addr], Addr);
19781981
{error, Reason} ->
19791982
{skip, Reason}
@@ -2183,14 +2186,21 @@ do_open_and_connect(ServerAddresses, AddressToConnectTo) ->
21832186
do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun).
21842187
%%
21852188
do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) ->
2189+
?P("~s -> entry with"
2190+
"~n ServerAddresses: ~p"
2191+
"~n AddressToConnectTo: ~p",
2192+
[?FUNCTION_NAME, ServerAddresses, AddressToConnectTo]),
21862193
{ServerFamily, ServerOpts} = get_family_by_addrs(ServerAddresses),
2187-
io:format("Serving ~p addresses: ~p~n",
2188-
[ServerFamily, ServerAddresses]),
2194+
?P("~s -> Serving ~p addresses: ~p~n",
2195+
[?FUNCTION_NAME, ServerFamily, ServerAddresses]),
21892196
S1 = ok(gen_sctp:open(0, [{ip,Addr} || Addr <- ServerAddresses] ++
21902197
[ServerFamily|ServerOpts])),
21912198
ok = gen_sctp:listen(S1, true),
21922199
P1 = ok(inet:port(S1)),
2193-
?P("S1: ~p", [inet:sockname(S1)]),
2200+
?P("~s -> "
2201+
"~n S1: ~p"
2202+
"~n port of S1: ~p"
2203+
"~n sockname S1: ~p", [?FUNCTION_NAME, S1, P1, inet:sockname(S1)]),
21942204
ClientFamily = get_family_by_addr(AddressToConnectTo),
21952205
ClientOpts =
21962206
[ClientFamily |
@@ -2201,19 +2211,26 @@ do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) ->
22012211
[]
22022212
end],
22032213
S2 = ok(gen_sctp:open(0, ClientOpts)),
2204-
?P("S2: ~p", [inet:sockname(S2)]),
2214+
?P("~s -> "
2215+
"~n S2: ~p"
2216+
"~n sockname S2: ~p", [?FUNCTION_NAME, S2, inet:sockname(S2)]),
22052217
log(open),
2206-
io:format("Connecting to ~p ~p~n",
2207-
[ClientFamily, AddressToConnectTo]),
2218+
?P("~s -> [~w] try connect to ~p",
2219+
[?FUNCTION_NAME, ClientFamily, AddressToConnectTo]),
22082220
%% Verify client can connect
22092221
#sctp_assoc_change{state=comm_up} = S2Assoc =
22102222
ok(gen_sctp:connect(S2, AddressToConnectTo, P1, [])),
22112223
log(comm_up),
22122224
%% verify server side also receives comm_up from client
2225+
?P("~s -> await (server side) comm-up (eventually)", [?FUNCTION_NAME]),
22132226
S1Assoc = recv_comm_up_eventually(S1),
2227+
?P("~s -> verify", [?FUNCTION_NAME]),
22142228
Result = Fun(S1, ServerFamily, S1Assoc, S2, ClientFamily, S2Assoc),
2229+
?P("~s -> cleanup", [?FUNCTION_NAME]),
22152230
ok = gen_sctp:close(S2),
22162231
ok = gen_sctp:close(S1),
2232+
?P("~s -> done when"
2233+
"~n Result: ~p", [?FUNCTION_NAME, Result]),
22172234
Result.
22182235

22192236
%% If at least one of the addresses is an ipv6 address, return inet6, else inet.

‎lib/kernel/test/gen_tcp_misc_SUITE.erl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10140,17 +10140,17 @@ is_socket_supported() ->
1014010140
#{load_nif_result := LoadRes} ->
1014110141
?P("~s -> 'socket' not supperted"
1014210142
"~n (socket) nif load result: ~p", [?FUNCTION_NAME, LoadRes]),
10143-
{skip, "esock not supported"};
10143+
skip("esock not supported");
1014410144
_ ->
1014510145
?P("~s -> 'socket' not supperted", [?FUNCTION_NAME]),
10146-
{skip, "esock not supported"}
10146+
skip("esock not supported")
1014710147
catch
1014810148
error : notsup ->
1014910149
?P("~s(error,notsup) -> 'socket' not supperted", [?FUNCTION_NAME]),
10150-
{skip, "esock not supported"};
10150+
skip("esock not supported");
1015110151
error : undef ->
1015210152
?P("~s(error,undef) -> 'socket' not supperted", [?FUNCTION_NAME]),
10153-
{skip, "esock not configured"}
10153+
skip("esock not configured")
1015410154
end.
1015510155

1015610156
has_support_sock_priority() ->

‎lib/kernel/test/inet_sockopt_SUITE.erl‎

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,14 +366,19 @@ loop_all(Config) when is_list(Config) ->
366366
?TC_TRY(?FUNCTION_NAME, Cond, Pre, Case, Post).
367367

368368
do_loop_all(Config, _) ->
369+
?P("~s -> try all (TCP) listen options", [?FUNCTION_NAME]),
369370
ListenFailures =
370371
lists:foldr(make_check_fun(Config, listen),[],all_listen_options()),
372+
?P("~s -> try all (TCP) accept options", [?FUNCTION_NAME]),
371373
AcceptFailures =
372374
lists:foldr(make_check_fun(Config, accept),[],all_accept_options()),
375+
?P("~s -> try all (TCP) connect options", [?FUNCTION_NAME]),
373376
ConnectFailures =
374377
lists:foldr(make_check_fun(Config, connect),[],all_connect_options()),
378+
?P("~s -> try all UDP options", [?FUNCTION_NAME]),
375379
UdpFailures =
376380
lists:foldr(make_check_fun(Config),[],all_udp_options()),
381+
?P("~s -> done - check results", [?FUNCTION_NAME]),
377382
case ListenFailures++AcceptFailures++ConnectFailures++UdpFailures of
378383
[] ->
379384
ok;
@@ -1138,6 +1143,13 @@ all_ok(_) ->
11381143

11391144
make_check_fun(Config, Type) ->
11401145
fun({Name,V1,V2,Mand,Chang},Acc) ->
1146+
?P("~s:fun -> entry with"
1147+
"~n Name: ~p"
1148+
"~n V1: ~p"
1149+
"~n V2: ~p"
1150+
"~n Mand: ~p"
1151+
"~n Chang: ~p",
1152+
[?FUNCTION_NAME, Name, V1, V2, Mand, Chang]),
11411153
{LO1,CO1} = case Type of
11421154
connect -> {[],[{Name,V1}]};
11431155
_ -> {[{Name,V1}],[]}
@@ -1389,11 +1401,36 @@ mandatory_exclusiveaddruse(_OsType, _OsVersion) ->
13891401
false.
13901402

13911403
create_socketpair_init(Config, ListenOptions, ConnectOptions) ->
1392-
{ok,LS} = ?LISTEN(Config, 0, ListenOptions),
1404+
LS = case ?LISTEN(Config, 0, ListenOptions) of
1405+
{ok, LSock} ->
1406+
LSock;
1407+
{error, enotsup = LReason} ->
1408+
?P("~s -> failed create listen socket with: "
1409+
"~n Options: ~p"
1410+
"~n Reason: ~p", [ListenOptions, LReason]),
1411+
throw({skip, {LReason, listen}});
1412+
{error, LReason} = LError ->
1413+
?P("~s -> failed create listen socket with: "
1414+
"~n Options: ~p"
1415+
"~n Reason: ~p", [ListenOptions, LReason]),
1416+
exit(LError)
1417+
end,
13931418
{ok,Port} = inet:port(LS),
1394-
{ok,CS} = ?CONNECT(Config, localhost, Port, ConnectOptions),
1395-
{ok,AS} = gen_tcp:accept(LS),
1396-
{LS,AS,CS}.
1419+
case ?CONNECT(Config, localhost, Port, ConnectOptions) of
1420+
{ok, CS} ->
1421+
{ok, AS} = gen_tcp:accept(LS),
1422+
{LS,AS,CS};
1423+
{error, enotsup = CReason} ->
1424+
?P("~s -> failed create connect socket with: "
1425+
"~n Options: ~p"
1426+
"~n Reason: ~p", [ConnectOptions, CReason]),
1427+
throw({skip, {CReason, listen}});
1428+
{error, CReason} = CError ->
1429+
?P("~s -> failed create connect socket with: "
1430+
"~n Options: ~p"
1431+
"~n Reason: ~p", [ConnectOptions, CReason]),
1432+
exit(CError)
1433+
end.
13971434

13981435
create_socketpair(Config, ListenOptions, ConnectOptions) ->
13991436
{LS,AS,CS} = create_socketpair_init(Config, ListenOptions, ConnectOptions),

‎lib/kernel/test/socket_api_SUITE.erl‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21242,12 +21242,14 @@ api_opt_ip_tos_udp(InitState) ->
2124221242
?SEV_IPRINT("expected default tos: ~p", [Value]),
2124321243
ok;
2124421244
{ok, Value} ->
21245-
%% On FreeBSD 14 default value is not 0!
21245+
%% On FreeBSD 14 & 15 default value is not 0!
2124621246
case os:type() of
2124721247
{unix, freebsd} ->
2124821248
case os:version() of
21249-
{14, _, _}
21250-
when (Value =:= mincost) ->
21249+
{Maj, _, _}
21250+
when ((Maj =:= 14) orelse
21251+
(Maj =:= 15)) andalso
21252+
(Value =:= mincost) ->
2125121253
ok;
2125221254
_ ->
2125321255
?SEV_EPRINT("Unexpected "

0 commit comments

Comments
 (0)