aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-10-12 16:07:50 +0200
committerLukas Larsson <[email protected]>2015-10-12 16:07:50 +0200
commit4b33813231f6a0a6f2c7aa3d369ede7373229522 (patch)
tree0c9af7b5c5b1182aa3bdd216507864c0705b84a3 /erts
parent6326eb0c87c97ac463220cdc5138c3694e5ef7ec (diff)
downloadotp-4b33813231f6a0a6f2c7aa3d369ede7373229522.tar.gz
otp-4b33813231f6a0a6f2c7aa3d369ede7373229522.tar.bz2
otp-4b33813231f6a0a6f2c7aa3d369ede7373229522.zip
erts: Don't run processes tests on lcnt with little memory
Diffstat (limited to 'erts')
-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;