diff options
| author | Rickard Green <[email protected]> | 2016-08-30 15:22:40 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-30 15:22:40 +0200 |
| commit | 16f4bd5f6cb5fe6d6412ae219634902813bd9cce (patch) | |
| tree | 76a2609df5f8604769315cd23502d566f133a67e /erts/emulator/test/z_SUITE.erl | |
| parent | a74e538f5fa73aed871a62f4f25efe06c1df19e6 (diff) | |
| parent | 93fb8ecb7ed41e7c441b1c72901d6db76c24fd8d (diff) | |
| download | otp-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/z_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/z_SUITE.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/emulator/test/z_SUITE.erl b/erts/emulator/test/z_SUITE.erl index d1085c1958..ab56018373 100644 --- a/erts/emulator/test/z_SUITE.erl +++ b/erts/emulator/test/z_SUITE.erl @@ -191,7 +191,13 @@ node_container_refc_check(Config) when is_list(Config) -> ok. long_timers(Config) when is_list(Config) -> - ok = long_timers_test:check_result(). + case long_timers_test:check_result() of + ok -> ok; + high_cpu -> {comment, "Ignored failures due to high CPU utilization"}; + missing_cpu_info -> {comment, "Ignored failures due to missing CPU utilization information"}; + Fail -> ct:fail(Fail) + end. + pollset_size(Config) when is_list(Config) -> Name = pollset_size_testcase_initial_state_holder, |