aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-11-02 16:00:18 +0100
committerLukas Larsson <[email protected]>2015-11-02 16:00:18 +0100
commit5fbb0709c07420c600758577f9e2de80dd01f93b (patch)
tree8df9c70199323455d2e0121dd9baa082a89f9446 /erts/emulator
parent33b1771503cd399c8d0ce512ed98e2701a0c4ac8 (diff)
parent4b33813231f6a0a6f2c7aa3d369ede7373229522 (diff)
downloadotp-5fbb0709c07420c600758577f9e2de80dd01f93b.tar.gz
otp-5fbb0709c07420c600758577f9e2de80dd01f93b.tar.bz2
otp-5fbb0709c07420c600758577f9e2de80dd01f93b.zip
Merge branch 'lukas/erts/process_mem_test_fix/OTP-13077' into maint
* lukas/erts/process_mem_test_fix/OTP-13077: erts: Don't run processes tests on lcnt with little memory
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/process_SUITE.erl10
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;