File 0467-erts-Fix-cleanup-of-latency-dist-testcases.patch of Package erlang
From 9eeabce3fe8386745dd934368fb61bab00a76e30 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 2 Jun 2020 14:21:29 +0200
Subject: [PATCH 10/18] erts: Fix cleanup of latency dist testcases
---
erts/emulator/test/distribution_SUITE.erl | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 52df62d057..8ec5ceb3ff 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -1516,18 +1516,19 @@ measure_latency_large_message(Nodename, DataFun) ->
measure_latency(DataFun, Dropper, Echo, Payload) ->
+ TCProc = self(),
+
flush(),
Senders = [spawn_monitor(
fun F() ->
DataFun(Dropper, Payload),
- receive
- die -> ok
- after 0 ->
- F()
- end
+ F()
end) || _ <- lists:seq(1,2)],
+ %% Link in order to cleanup properly if TC crashes
+ [link(Sender) || {Sender,_} <- Senders],
+
wait_for_busy_dist(2 * 60 * 1000, 10),
{TS, Times} =
@@ -1544,7 +1545,8 @@ measure_latency(DataFun, Dropper, Echo, Payload) ->
ct:pal("Times: Avg: ~p Max: ~p Min: ~p Var: ~p",
[Avg, lists:max(Times), lists:min(Times), StdDev]),
[begin
- Sender ! die,
+ unlink(Sender),
+ exit(Sender,die),
receive
{'DOWN', Ref, process, _, _} ->
ok
--
2.26.2