aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/socket_test_evaluator.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2018-12-21 12:16:44 +0100
committerMicael Karlberg <[email protected]>2018-12-21 14:21:55 +0100
commit5cb57ba153b9febfca17f90166791e104262615e (patch)
treec963596c9f28fbe13fd3893fd87416f4273b2c87 /erts/emulator/test/socket_test_evaluator.erl
parentff3ce49e25ea150c0637bcb584cffdd88e560e5b (diff)
downloadotp-5cb57ba153b9febfca17f90166791e104262615e.tar.gz
otp-5cb57ba153b9febfca17f90166791e104262615e.tar.bz2
otp-5cb57ba153b9febfca17f90166791e104262615e.zip
[socket-nif|test] Buffer set and adjusted traffic ping-pong iterations
Handle (rcv and snd) buffer set failure. The number of iterations (message exchanges) that the traffic ping-cases has been adjusted down (by a factor of 10). Also, improve skip'ing. OTP-14831
Diffstat (limited to 'erts/emulator/test/socket_test_evaluator.erl')
-rw-r--r--erts/emulator/test/socket_test_evaluator.erl14
1 files changed, 12 insertions, 2 deletions
diff --git a/erts/emulator/test/socket_test_evaluator.erl b/erts/emulator/test/socket_test_evaluator.erl
index deea7e5d36..fe6a6ff70a 100644
--- a/erts/emulator/test/socket_test_evaluator.erl
+++ b/erts/emulator/test/socket_test_evaluator.erl
@@ -130,6 +130,10 @@ loop(ID, [#{desc := Desc,
"~n Reason: ~p", [ID, Reason]),
exit({command_failed, ID, Reason, State})
catch
+ throw:{skip, R} = E:_ ->
+ eprint("command ~w skip: "
+ "~n Skip Reason: ~p", [ID, R]),
+ exit(E);
C:E:S ->
eprint("command ~w crashed: "
"~n Class: ~p"
@@ -150,6 +154,8 @@ await_finish(Evs) ->
await_finish([], []) ->
ok;
await_finish([], Fails) ->
+ ?SEV_EPRINT("Fails: "
+ "~n ~p", [Fails]),
Fails;
await_finish(Evs, Fails) ->
receive
@@ -443,8 +449,12 @@ await(ExpPid, Name, Announcement, Slogan, OtherPids)
ok;
{Announcement, Pid, Slogan, Extra} when (Pid =:= ExpPid) ->
{ok, Extra};
+ {'DOWN', _, process, Pid, {skip, SkipReason}} when (Pid =:= ExpPid) ->
+ iprint("Unexpected SKIP from ~w (~p): "
+ "~n ~p", [Name, Pid, SkipReason]),
+ ?LIB:skip({Name, SkipReason});
{'DOWN', _, process, Pid, Reason} when (Pid =:= ExpPid) ->
- eprint("Unexpected DOWN regarding ~w ~p: "
+ eprint("Unexpected DOWN from ~w (~p): "
"~n ~p", [Name, Pid, Reason]),
{error, {unexpected_exit, Name}};
{'DOWN', _, process, OtherPid, Reason} ->
@@ -476,7 +486,7 @@ pi(Pid, Item) ->
check_down(Pid, DownReason, Pids) ->
case lists:keymember(Pid, 1, Pids) of
{value, {_, Name}} ->
- eprint("Unexpected DOWN regarding ~w ~p: "
+ eprint("Unexpected DOWN from ~w (~p): "
"~n ~p", [Name, Pid, DownReason]),
{error, {unexpected_exit, Name}};
false ->