diff options
author | Siri Hansen <siri@erlang.org> | 2011-07-08 16:03:26 +0200 |
---|---|---|
committer | Siri Hansen <siri@erlang.org> | 2011-07-08 16:03:26 +0200 |
commit | f34758a976eebc4a3bc5a42152a5053472db9a85 (patch) | |
tree | fbd28a0759d763b3f6b36e9fa02bad28677a6040 | |
parent | 6d486906a02cdeaa714ef83eeb94da3a0c669e4a (diff) | |
download | otp-f34758a976eebc4a3bc5a42152a5053472db9a85.tar.gz otp-f34758a976eebc4a3bc5a42152a5053472db9a85.tar.bz2 otp-f34758a976eebc4a3bc5a42152a5053472db9a85.zip |
Make sure supervisor_SUITE:count_children_memory is always skipped when erlang:memory is not supported
Replace the count_children_allocator_test with try erlang:memory in
order to make sure there is no attempt at running this test case if
erlang:memory is not supported.
-rw-r--r-- | lib/stdlib/test/supervisor_SUITE.erl | 18 |
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 " |