Merge branch 'lukas/OTP-22-rc2/misc-fixes/OTP-15773'

* lukas/OTP-22-rc2/misc-fixes/OTP-15773:
  erts: Yield correctly when iterating over distr exit messages
  erts: Fix cerl -rr to use correct etp file
  erts: Fix etp-process-info to print exiting and free processes
  tools: Adjust instrument abort tc to better trigger faults
  erts: Fix cleanup of message factory undo
  erts: Make dump_SUITE:free_dump not dump via rpc
  erts: Add extra debugging to dist frag testcases
  erts: Run smaller dist frag test to 32 bit machines
  erl_docgen: Remove accidentally merged debug printout
  erts: Fix z_SUITE to always look for cerl in ERL_TOP
  otp: make top Makefile app target respect TYPE variable
  vxworks: Make vxworks configure use environment CFLAGS
  erts: Make erts_free debug failure easier to diagnose
  erts: Fix gcc warning in to_erl

1 files changed, 34 insertions, 17 deletions

diff --git a/erts/emulator/test/dump_SUITE.erl b/erts/emulator/test/dump_SUITE.erl
index 3b860ebdf6..9f8ac42fa9 100644
--- a/erts/emulator/test/dump_SUITE.erl
+++ b/erts/emulator/test/dump_SUITE.erl
@@ -137,26 +137,43 @@ exiting_dump(Config) when is_list(Config) ->
 free_dump(Config) when is_list(Config) ->
     Dump = filename:join(proplists:get_value(priv_dir, Config),"signal_abort.dump"),
 
-    {ok, Node} = start_node(Config),
-
-    Self = self(),
-
-    Pid = spawn_link(Node,
-                     fun() ->
-                             Self ! ready,
-                             receive
-                                 ok ->
-                                     unlink(Self),
-                                     exit(lists:duplicate(1000,1000))
-                             end
-                     end),
+    {ok, NodeA} = start_node(Config),
+    {ok, NodeB} = start_node(Config),
 
-    true = rpc:call(Node, os, putenv, ["ERL_CRASH_DUMP",Dump]),
 
-    [erlang:monitor(process, Pid) || _ <- lists:seq(1,10000)],
-    receive ready -> unlink(Pid), Pid ! ok end,
+    Self = self(),
 
-    rpc:call(Node, erlang, halt, ["dump"]),
+    PidA = spawn_link(
+             NodeA,
+             fun() ->
+                     Self ! ready,
+                     receive
+                         ok ->
+                             spawn(fun() ->
+                                           erlang:system_monitor(self(), [busy_dist_port]),
+                                           timer:sleep(5),
+                                           receive
+                                               M ->
+                                                   io:format("~p",[M]),
+                                                   erlang:halt("dump")
+                                           end
+                                   end),
+                             exit(lists:duplicate(1000000,100))
+                     end
+             end),
+
+    spawn_link(NodeB,
+               fun() ->
+                       [erlang:monitor(process, PidA) || _ <- lists:seq(1,10000)],
+                       Self ! done,
+                       receive _ -> ok end
+               end),
+
+    receive done -> ok end,
+    true = rpc:call(NodeA, os, putenv, ["ERL_CRASH_DUMP",Dump]),
+    ct:pal("~p",[rpc:call(NodeA, distribution_SUITE, make_busy, [NodeB, 1000])]),
+
+    receive ready -> unlink(PidA), PidA ! ok end,
 
     {ok, Bin} = get_dump_when_done(Dump),