diff options
Diffstat (limited to 'erts/emulator/test/trace_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/trace_SUITE.erl | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl index d25e8b6634..37f47cff30 100644 --- a/erts/emulator/test/trace_SUITE.erl +++ b/erts/emulator/test/trace_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2021. All Rights Reserved. +%% Copyright Ericsson AB 1997-2022. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -73,7 +73,8 @@ end_per_testcase(_Case, Config) -> Receiver = proplists:get_value(receiver, Config), unlink(Receiver), exit(Receiver, die), - ok. + + erts_test_utils:ept_check_leaked_nodes(Config). %% No longer testing anything, just reporting whether cpu_timestamp %% is enabled or not. @@ -130,8 +131,7 @@ receive_trace(Config) when is_list(Config) -> {true, true}]), %% Remote messages - OtherName = atom_to_list(?MODULE)++"_receive_trace", - {ok, OtherNode} = start_node(OtherName), + {ok, Peer, OtherNode} = ?CT_PEER(), RemoteProc = spawn_link(OtherNode, ?MODULE, process, [self()]), io:format("RemoteProc = ~p ~n", [RemoteProc]), @@ -179,7 +179,7 @@ receive_trace(Config) when is_list(Config) -> F2(NN, {true, true}), unlink(RemoteProc), - true = stop_node(OtherNode), + peer:stop(Peer), %% Timeout Receiver ! {set_timeout, 10}, @@ -647,8 +647,7 @@ procs_trace(Config) when is_list(Config) -> dist_procs_trace(Config) when is_list(Config) -> ct:timetrap({seconds, 15}), - OtherName = atom_to_list(?MODULE)++"_dist_procs_trace", - {ok, OtherNode} = start_node(OtherName), + {ok, Peer, OtherNode} = ?CT_PEER(), Self = self(), process_flag(trap_exit, true), %% @@ -695,7 +694,7 @@ dist_procs_trace(Config) when is_list(Config) -> %% %% exit (with registered name, due to link) - Name = list_to_atom(OtherName), + Name = list_to_atom(hd(string:lexemes(atom_to_list(OtherNode), "@"))), Reason2 = make_ref(), Proc1 ! {link_please, Proc2}, {trace, Proc1, link, Proc2} = receive_first_trace(), @@ -708,8 +707,7 @@ dist_procs_trace(Config) when is_list(Config) -> receive_nothing(), %% %% Done. - true = stop_node(OtherNode), - ok. + peer:stop(Peer). %% Test trace(new, How, [procs]). procs_new_trace(Config) when is_list(Config) -> @@ -1724,7 +1722,7 @@ trace_delivered(Config) when is_list(Config) -> %% This testcase checks that receive trace works on exit signal messages %% when the sender of the exit signal is the process itself. -trap_exit_self_receive(Config) -> +trap_exit_self_receive(Config) when is_list(Config) -> Parent = self(), Proc = spawn_link(fun() -> process(Parent) end), @@ -1754,7 +1752,7 @@ trace_info_badarg(Config) when is_list(Config) -> %% An incoming suspend monitor down wasn't handled %% correct when the local monitor half had been %% removed with an emulator crash as result. -erl_704(Config) -> +erl_704(Config) when is_list(Config) -> erl_704_test(100). erl_704_test(0) -> @@ -1944,16 +1942,6 @@ fun_spawn(Fun, Args) -> spawn_link(erlang, apply, [Fun, Args]). -start_node(Name) -> - Pa = filename:dirname(code:which(?MODULE)), - Cookie = atom_to_list(erlang:get_cookie()), - test_server:start_node(Name, slave, - [{args, "-setcookie " ++ Cookie ++" -pa " ++ Pa}]). - -stop_node(Node) -> - test_server:stop_node(Node). - - wait_for_empty_runq(DeadLine) -> case statistics(run_queue) of 0 -> true; |