From 6c336ea59d172afcbb73bcc248ab14794432f27f Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 11 Feb 2020 15:45:31 +0100
Subject: Test case verifying exit signal kill to killed mapping

---
 erts/emulator/test/signal_SUITE.erl | 65 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/erts/emulator/test/signal_SUITE.erl b/erts/emulator/test/signal_SUITE.erl
index f1d11d1814..df6c8ce9ae 100644
--- a/erts/emulator/test/signal_SUITE.erl
+++ b/erts/emulator/test/signal_SUITE.erl
@@ -47,7 +47,8 @@
 	 pending_exit_process_info_1/1,
 	 pending_exit_process_info_2/1,
 	 pending_exit_group_leader/1,
-	 exit_before_pending_exit/1]).
+	 exit_before_pending_exit/1,
+         kill2killed/1]).
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     available_internal_state(true),
@@ -366,6 +367,68 @@ pending_exit_group_leader(Config) when is_list(Config) ->
     verify_pending_exit_success(S),
     comment().
 
+kill2killed(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    kill2killed_test(node()),
+    {ok, Node} = start_node(Config),
+    kill2killed_test(Node),
+    stop_node(Node),
+    ok.
+
+kill2killed_test(Node) ->
+    if Node == node() ->
+            io:format("Testing against local node", []);
+       true ->
+            io:format("Testing against remote node ~p", [Node])
+    end,
+    check_exit(Node, other_exit2, 1),
+    check_exit(Node, other_exit2, 2),
+    check_exit(Node, other_exit2, 9),
+    check_exit(Node, other_exit2, 10),
+    check_exit(Node, exit2, 1),
+    check_exit(Node, exit2, 2),
+    check_exit(Node, exit2, 9),
+    check_exit(Node, exit2, 10),
+    check_exit(Node, exit1, 1),
+    check_exit(Node, exit1, 2),
+    check_exit(Node, exit1, 9),
+    check_exit(Node, exit1, 10),
+    ok.
+
+check_exit(Node, Type, N) ->
+    io:format("Testing ~p length ~p~n", [Type, N]),
+    P = spawn_link_line(Node, node(), Type, N, self()),
+    if Type == other_exit2 ->
+            receive
+                {end_of_line, EOL} ->
+                    exit(EOL, kill)
+            end;
+       true -> ok
+    end,
+    receive
+        {'EXIT', P, Reason} ->
+            if Type == exit1 ->
+                    kill = Reason;
+               true ->
+                    killed = Reason
+            end
+    end.
+
+spawn_link_line(_NodeA, _NodeB, other_exit2, 0, Tester) ->
+    Tester ! {end_of_line, self()},
+    receive after infinity -> ok end;
+spawn_link_line(_NodeA, _NodeB, exit1, 0, _Tester) ->
+    exit(kill);
+spawn_link_line(_NodeA, _NodeB, exit2, 0, _Tester) ->
+    exit(self(), kill);
+spawn_link_line(NodeA, NodeB, Type, N, Tester) ->
+    spawn_link(NodeA,
+               fun () ->
+                       spawn_link_line(NodeB, NodeA, Type, N-1, Tester),
+                       receive after infinity -> ok end
+               end).
+
+
 %%
 %% -- Internal utils --------------------------------------------------------
 %%
-- 
cgit v1.2.1


From 02eb36c4a46815d3d9128fec9f57e823de54f1ed Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 11 Feb 2020 18:20:58 +0100
Subject: Activate test

---
 erts/emulator/test/signal_SUITE.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erts/emulator/test/signal_SUITE.erl b/erts/emulator/test/signal_SUITE.erl
index df6c8ce9ae..2219eea66b 100644
--- a/erts/emulator/test/signal_SUITE.erl
+++ b/erts/emulator/test/signal_SUITE.erl
@@ -78,7 +78,8 @@ all() ->
      pending_exit_process_display,
      pending_exit_process_info_1,
      pending_exit_process_info_2, pending_exit_group_leader,
-     exit_before_pending_exit].
+     exit_before_pending_exit,
+     kill2killed].
 
 
 %% Test that exit signals and messages are received in correct order
-- 
cgit v1.2.1