aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/process_SUITE.erl
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-08-30 15:22:40 +0200
committerRickard Green <[email protected]>2016-08-30 15:22:40 +0200
commit16f4bd5f6cb5fe6d6412ae219634902813bd9cce (patch)
tree76a2609df5f8604769315cd23502d566f133a67e /erts/emulator/test/process_SUITE.erl
parenta74e538f5fa73aed871a62f4f25efe06c1df19e6 (diff)
parent93fb8ecb7ed41e7c441b1c72901d6db76c24fd8d (diff)
downloadotp-16f4bd5f6cb5fe6d6412ae219634902813bd9cce.tar.gz
otp-16f4bd5f6cb5fe6d6412ae219634902813bd9cce.tar.bz2
otp-16f4bd5f6cb5fe6d6412ae219634902813bd9cce.zip
Merge branch 'rickard/test-cuddle' into maint
* rickard/test-cuddle: Fix dirty_nif_SUITE:dirty_call_while_terminated test case Adjust process_SUITE:no_priority_inversion2 Allow larger timeout delay in driver_SUITE Ignore long time failures during high CPU utilization Cleanup in statistics_SUITE:runtime_update test Improve timer tests in driver_SUITE Fix statistics_SUITE:scheduler_wall_time test Fix scheduler_SUITE:scheduler_suspend test Fix scheduler_SUITE:scheduler_threads test Fix scheduler_SUITE:update_cpu_info test Skip nif_SUITE:consume_timeslice test when debug compiled Increase time margin in timer_bif_SUITE:start_timer_1 test
Diffstat (limited to 'erts/emulator/test/process_SUITE.erl')
-rw-r--r--erts/emulator/test/process_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index dae8990f56..7462c8c593 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -2376,7 +2376,7 @@ no_priority_inversion2(Config) when is_list(Config) ->
[{priority, max}, monitor, link])
end,
lists:seq(1, 2*erlang:system_info(schedulers))),
- receive after 500 -> ok end,
+ receive after 2000 -> ok end,
{PL, ML} = spawn_opt(fun () ->
tok_loop()
end,