diff options
| author | Lukas Larsson <[email protected]> | 2015-11-02 16:00:31 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2015-11-02 16:00:31 +0100 |
| commit | ca1120b8cc473c0deb90a110dd0a08e5270ab3c3 (patch) | |
| tree | bb27919be12842e0542c00f33712f2a82aae6286 /erts/emulator | |
| parent | 0a16594912e2d77e70eccf89232df8287f0336c5 (diff) | |
| parent | 5fbb0709c07420c600758577f9e2de80dd01f93b (diff) | |
| download | otp-ca1120b8cc473c0deb90a110dd0a08e5270ab3c3.tar.gz otp-ca1120b8cc473c0deb90a110dd0a08e5270ab3c3.tar.bz2 otp-ca1120b8cc473c0deb90a110dd0a08e5270ab3c3.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/test/process_SUITE.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl index 4c311e1f06..97aa5e573e 100644 --- a/erts/emulator/test/process_SUITE.erl +++ b/erts/emulator/test/process_SUITE.erl @@ -1478,7 +1478,15 @@ processes_this_tab(doc) -> processes_this_tab(suite) -> []; processes_this_tab(Config) when is_list(Config) -> - sys_mem_cond_run(1024, fun () -> chk_processes_bif_test_res(processes_bif_test()) end). + Mem = case {erlang:system_info(build_type), + erlang:system_info(allocator)} of + {lcnt, {_, _Vsn, [sys_alloc], _Opts}} -> + %% When running +Mea min + lcnt we may need more memory + 1024 * 4; + _ -> + 1024 + end, + sys_mem_cond_run(Mem, fun () -> chk_processes_bif_test_res(processes_bif_test()) end). chk_processes_bif_test_res(ok) -> ok; chk_processes_bif_test_res({comment, _} = Comment) -> Comment; |