aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-06-22 16:55:25 +0200
committerRickard Green <[email protected]>2016-06-27 17:02:41 +0200
commit46b3f3d62b2c202ad08af87130eee1e16bc464af (patch)
tree3e20e381728ed7889c47265671287fd9e0b785a2 /erts/emulator
parent7f951996600d1d09c8afa422beadf7bdde772471 (diff)
downloadotp-46b3f3d62b2c202ad08af87130eee1e16bc464af.tar.gz
otp-46b3f3d62b2c202ad08af87130eee1e16bc464af.tar.bz2
otp-46b3f3d62b2c202ad08af87130eee1e16bc464af.zip
Fix statistics_SUITE:scheduler_wall_time test
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/statistics_SUITE.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index 71ef003b25..4a07c6a10a 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -311,7 +311,15 @@ scheduler_wall_time(Config) when is_list(Config) ->
true -> exit({fullload, FullLoad})
end,
- [exit(Pid, kill) || Pid <- [P1|HalfHogs++LastHogs]],
+ KillHog = fun (HP) ->
+ HPM = erlang:monitor(process, HP),
+ exit(HP, kill),
+ receive
+ {'DOWN', HPM, process, HP, killed} ->
+ ok
+ end
+ end,
+ [KillHog(Pid) || Pid <- [P1|HalfHogs++LastHogs]],
AfterLoad = get_load(),
{false,_} = {lists:any(fun(Load) -> Load > 25 end, AfterLoad),AfterLoad},
true = erlang:system_flag(scheduler_wall_time, false)