aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-07-11 10:18:29 +0200
committerSiri Hansen <[email protected]>2011-07-11 10:18:29 +0200
commit2a5d951162e6d9c918132d60c5c39302399dfca4 (patch)
tree9fea936aaa9b087e841db57ab8dbba23b8b5c4ac
parente47607acb1f9aefb65f5613509f902e2f097cffc (diff)
parentf34758a976eebc4a3bc5a42152a5053472db9a85 (diff)
downloadotp-2a5d951162e6d9c918132d60c5c39302399dfca4.tar.gz
otp-2a5d951162e6d9c918132d60c5c39302399dfca4.tar.bz2
otp-2a5d951162e6d9c918132d60c5c39302399dfca4.zip
Merge branch 'siri/stdlib/count_children_memory-notsup/OTP-9426' into dev
* siri/stdlib/count_children_memory-notsup/OTP-9426: Make sure supervisor_SUITE:count_children_memory is always skipped when erlang:memory is not supported
-rw-r--r--lib/stdlib/test/supervisor_SUITE.erl18
1 files changed, 3 insertions, 15 deletions
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index c79a5002fb..ff5e4c629a 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -114,10 +114,9 @@ end_per_group(_GroupName, Config) ->
Config.
init_per_testcase(count_children_memory, Config) ->
- MemoryState = erlang:system_info(allocator),
- case count_children_allocator_test(MemoryState) of
- true -> Config;
- false ->
+ try erlang:memory() of
+ _ -> Config
+ catch error:notsup ->
{skip, "+Meamin used during test; erlang:memory/1 not available"}
end;
init_per_testcase(_Case, Config) ->
@@ -1032,17 +1031,6 @@ count_children_memory(Config) when is_list(Config) ->
[terminate(SupPid, Pid, child, kill) || {undefined, Pid, worker, _Modules} <- Children3],
[1,0,0,0] = get_child_counts(sup_test).
-count_children_allocator_test(MemoryState) ->
- Allocators = [temp_alloc, eheap_alloc, binary_alloc, ets_alloc,
- driver_alloc, sl_alloc, ll_alloc, fix_alloc, std_alloc,
- sys_alloc],
- MemoryStateList = element(4, MemoryState),
- AllocTypes = [lists:keyfind(Alloc, 1, MemoryStateList)
- || Alloc <- Allocators],
- AllocStates = [lists:keyfind(e, 1, AllocValue)
- || {_Type, AllocValue} <- AllocTypes],
- lists:all(fun(State) -> State == {e, true} end, AllocStates).
-
%%-------------------------------------------------------------------------
do_not_save_start_parameters_for_temporary_children(doc) ->
["Temporary children shall not be restarted so they should not "