aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-04-07 21:12:19 +0200
committerSverker Eriksson <[email protected]>2014-04-29 15:01:39 +0200
commitdaa54059610c3f36057a19285357da19ad45e8f0 (patch)
tree6673018c1fd1e018fc723d7c7ea26a1d0aa60416
parent07b8f441ca711f9812fad9e9115bab3c3aa92f79 (diff)
downloadotp-daa54059610c3f36057a19285357da19ad45e8f0.tar.gz
otp-daa54059610c3f36057a19285357da19ad45e8f0.tar.bz2
otp-daa54059610c3f36057a19285357da19ad45e8f0.zip
Fix timeout for match_spec_SUITE:otp_9422
Must receive 'abort' even after loop_runner has finished.
-rw-r--r--erts/emulator/test/match_spec_SUITE.erl12
1 files changed, 7 insertions, 5 deletions
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index 8038888796..fdce157abc 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -1009,12 +1009,14 @@ loop_runner(Collector, Fun, Laps) ->
end,
loop_runner_cont(Collector, Fun, 0, Laps).
-loop_runner_cont(_Collector, _Fun, Laps, Laps) ->
+loop_runner_cont(Collector, _Fun, Laps, Laps) ->
receive
- {done, Collector} ->
- io:format("loop_runner ~p exit after ~p laps\n", [self(), Laps]),
- Collector ! {gone, self()}
- end;
+ {done, Collector} -> ok;
+ {abort, Collector} -> ok
+ end,
+ io:format("loop_runner ~p exit after ~p laps\n", [self(), Laps]),
+ Collector ! {gone, self()};
+
loop_runner_cont(Collector, Fun, N, Laps) ->
Fun(),
receive