diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-07-22 13:36:00 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2013-07-22 13:36:00 +0200 |
| commit | da052b16d47b226eac4c5cf421be3f07aec18386 (patch) | |
| tree | 78a71100a0b074347c0dd4f7c6d5860193811b15 /erts/emulator/test/system_profile_SUITE.erl | |
| parent | aee76ad7e0efe5f97992350264029e198a7257a4 (diff) | |
| parent | 214e1bc1205621b8f802b8c3ac7e95f1717712cb (diff) | |
| download | otp-da052b16d47b226eac4c5cf421be3f07aec18386.tar.gz otp-da052b16d47b226eac4c5cf421be3f07aec18386.tar.bz2 otp-da052b16d47b226eac4c5cf421be3f07aec18386.zip | |
Merge branch 'egil/test-cuddling' into maint
Diffstat (limited to 'erts/emulator/test/system_profile_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/system_profile_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/test/system_profile_SUITE.erl b/erts/emulator/test/system_profile_SUITE.erl index ba94a371be..a387c08ef9 100644 --- a/erts/emulator/test/system_profile_SUITE.erl +++ b/erts/emulator/test/system_profile_SUITE.erl @@ -198,7 +198,9 @@ check_multi_scheduling_block(Nodes) -> Pid = start_profiler_process(), undefined = erlang:system_profile(Pid, [scheduler]), {ok, Supervisor} = start_load(Nodes), + wait(600), erlang:system_flag(multi_scheduling, block), + wait(600), erlang:system_flag(multi_scheduling, unblock), {Pid, [scheduler]} = erlang:system_profile(undefined, []), Events = get_profiler_events(), @@ -213,7 +215,6 @@ check_block_system(Nodes) -> Pid = start_profiler_process(), undefined = erlang:system_profile(Pid, [scheduler]), {ok, Supervisor} = start_load(Nodes), - % FIXME: remove wait !! wait(300), undefined = erlang:system_monitor(Dummy, [busy_port]), {Dummy, [busy_port]} = erlang:system_monitor(undefined, []), |