diff options
| author | Lukas Larsson <[email protected]> | 2016-06-14 10:22:40 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-06-14 10:22:40 +0200 |
| commit | 1418cbbb689dc2c88ecceaedb4eba33061d338e7 (patch) | |
| tree | 348257a01f32af0ceb349933c4a7dbe64c884df7 /erts/emulator/test/process_SUITE.erl | |
| parent | 0c8357d15dd2573331056a308e3744927ce406ad (diff) | |
| parent | 9411a2098d983cac05fd7198bba26b9d56aa484a (diff) | |
| download | otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.tar.gz otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.tar.bz2 otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.zip | |
Merge branch 'lukas/erts/testfixes-19'
* lukas/erts/testfixes-19:
erts: Increase bif and nif call_time trace test
erts: Fix distribution_SUITE:bulk_send_bigbig on windows
erts: Ensure bs_add_overflow test has enough memory
kernel: Better explain controlling_process' tcp behaviour
kernel: Fix t_recv_delim on bsd
os_mon: Make sure to start/stop os_mon in tests correctly
ssl: Fix use_interface dist_SSL test
erl_interface: Fix signed int overflow tc bug
erts: fix atom_roundtrip_r15b tc
erts: Require more memory for debug tests
Diffstat (limited to 'erts/emulator/test/process_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/process_SUITE.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl index 4ebc1f5782..dae8990f56 100644 --- a/erts/emulator/test/process_SUITE.erl +++ b/erts/emulator/test/process_SUITE.erl @@ -2581,7 +2581,10 @@ enable_internal_state() -> _ -> erts_debug:set_internal_state(available_internal_state, true) end. -sys_mem_cond_run(ReqSizeMB, TestFun) when is_integer(ReqSizeMB) -> +sys_mem_cond_run(OrigReqSizeMB, TestFun) when is_integer(OrigReqSizeMB) -> + %% Debug normally needs more memory, so double the requirement + Debug = erlang:system_info(debug_compiled), + ReqSizeMB = if Debug -> OrigReqSizeMB * 2; true -> OrigReqSizeMB end, case total_memory() of TotMem when is_integer(TotMem), TotMem >= ReqSizeMB -> TestFun(); |