diff options
| author | Rickard Green <[email protected]> | 2016-08-30 15:23:13 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-30 15:23:13 +0200 |
| commit | a786167f801993995f2a1c6a5368a519cb341800 (patch) | |
| tree | 3fee2b7435801b45924767595a06d6aff82d95de /erts/emulator/test/nif_SUITE.erl | |
| parent | b63e2f1fd14e47c779f047d74d5e7d8b88602e6a (diff) | |
| parent | 16f4bd5f6cb5fe6d6412ae219634902813bd9cce (diff) | |
| download | otp-a786167f801993995f2a1c6a5368a519cb341800.tar.gz otp-a786167f801993995f2a1c6a5368a519cb341800.tar.bz2 otp-a786167f801993995f2a1c6a5368a519cb341800.zip | |
Merge branch 'maint'
* maint:
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/nif_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/nif_SUITE.erl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl index a0e9f1bad6..b8fa7184b6 100644 --- a/erts/emulator/test/nif_SUITE.erl +++ b/erts/emulator/test/nif_SUITE.erl @@ -1443,6 +1443,17 @@ otp_9828_loop(Bin, Val) -> consume_timeslice(Config) when is_list(Config) -> + case {erlang:system_info(debug_compiled), + erlang:system_info(lock_checking)} of + {false, false} -> + consume_timeslice_test(Config); + {false, true} -> + {skipped, "Lock checking enabled"}; + _ -> + {skipped, "Debug compiled"} + end. + +consume_timeslice_test(Config) when is_list(Config) -> CONTEXT_REDS = 2000, Me = self(), Go = make_ref(), |