diff options
| author | Micael Karlberg <[email protected]> | 2011-02-28 11:44:35 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-02-28 11:44:35 +0100 |
| commit | 26eae94979083f6ae272b76589bce256b792e487 (patch) | |
| tree | 1ac07672c29efd352f2009908c1b441a31b74c24 /lib/stdlib/test/supervisor_SUITE.erl | |
| parent | 9671856faa243ee4567f4059fba28fd85b5d9baa (diff) | |
| parent | e170c7f2ce8e0ac2cd45c922afc138305ca34b79 (diff) | |
| download | otp-26eae94979083f6ae272b76589bce256b792e487.tar.gz otp-26eae94979083f6ae272b76589bce256b792e487.tar.bz2 otp-26eae94979083f6ae272b76589bce256b792e487.zip | |
Merge branch 'dev' into bmk/megaco/miscellaneous_dialyzer/OTP-9075
Had to fix a bunch of CopyRight end-dates (in erts files)...
Diffstat (limited to 'lib/stdlib/test/supervisor_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/supervisor_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl index 8aed93ce12..6e927da2ab 100644 --- a/lib/stdlib/test/supervisor_SUITE.erl +++ b/lib/stdlib/test/supervisor_SUITE.erl @@ -1310,7 +1310,7 @@ count_children_memory(Config) when is_list(Config) -> %% count_children consumes memory using an accumulator function, %% but the space can be reclaimed incrementally, - %% which_children may generate garbage that will reclaimed later. + %% which_children may generate garbage that will be reclaimed later. case (Size5 =< Size4) of true -> ok; false -> @@ -1338,8 +1338,8 @@ count_children_allocator_test(MemoryState) -> 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" - "save start parameters, as it potentially can" + ["Temporary children shall not be restarted so they should not " + "save start parameters, as it potentially can " "take up a huge amount of memory for no purpose."]; do_not_save_start_parameters_for_temporary_children(suite) -> []; |