aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-07-11 10:20:22 +0200
committerSiri Hansen <[email protected]>2011-07-11 10:20:22 +0200
commit80865e03583ebbee63a2a72be708f28c1e4a4f98 (patch)
tree76787a5f492dff1a5fa907634fbb7d7da7fb22ec /lib
parent5b265df6505f82b00d330a15fb1e3ec44986651d (diff)
parent2a5d951162e6d9c918132d60c5c39302399dfca4 (diff)
downloadotp-80865e03583ebbee63a2a72be708f28c1e4a4f98.tar.gz
otp-80865e03583ebbee63a2a72be708f28c1e4a4f98.tar.bz2
otp-80865e03583ebbee63a2a72be708f28c1e4a4f98.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib')
-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 969916abed..7a75114cb6 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -119,10 +119,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) ->
@@ -1118,17 +1117,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 "