diff options
| author | Sverker Eriksson <[email protected]> | 2014-04-29 15:04:12 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-04-29 15:04:12 +0200 |
| commit | aca0b6182b039333b4c963938878d9eecc85e5a1 (patch) | |
| tree | b11d038127d7525e0a9167e3ebcfcaa17e691b54 /erts/emulator | |
| parent | 13b2c8f9d2d77775778c2286322f76e7317b1ac4 (diff) | |
| parent | daa54059610c3f36057a19285357da19ad45e8f0 (diff) | |
| download | otp-aca0b6182b039333b4c963938878d9eecc85e5a1.tar.gz otp-aca0b6182b039333b4c963938878d9eecc85e5a1.tar.bz2 otp-aca0b6182b039333b4c963938878d9eecc85e5a1.zip | |
Merge branch 'sverk/test-cuddle' into maint
* sverk/test-cuddle:
Fix timeout for match_spec_SUITE:otp_9422
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/test/match_spec_SUITE.erl | 12 |
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 |