aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-11-27 11:53:49 +0100
committerSverker Eriksson <[email protected]>2013-11-27 11:53:49 +0100
commitd62be860546605bbf43f97d2ce0f7d32ed7d6ab9 (patch)
tree28451dacd5f1da95568a1bf81abb2c71196ad539
parentc3c686b6d38cd8e6344fea1ae62492932e5272e9 (diff)
parentf0b04f4e9a08c30fd948b1104ed0d5720012fbd8 (diff)
downloadotp-d62be860546605bbf43f97d2ce0f7d32ed7d6ab9.tar.gz
otp-d62be860546605bbf43f97d2ce0f7d32ed7d6ab9.tar.bz2
otp-d62be860546605bbf43f97d2ce0f7d32ed7d6ab9.zip
Merge branch 'maint'
-rw-r--r--lib/kernel/test/zlib_SUITE.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index bd237cb513..e91f6f18d4 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -565,8 +565,8 @@ intro(Config) when is_list(Config) ->
large_deflate(doc) -> "Test deflate large file, which had a bug reported on erlang-bugs";
large_deflate(suite) -> [];
large_deflate(Config) when is_list(Config) ->
- large_deflate().
-large_deflate() ->
+ large_deflate_do().
+large_deflate_do() ->
?line Z = zlib:open(),
?line Plain = rand_bytes(zlib:getBufSize(Z)*5),
?line ok = zlib:deflateInit(Z),
@@ -899,7 +899,7 @@ worker(Seed, FnATpl, Parent) ->
Parent ! self().
worker_loop(0, _FnATpl) ->
- large_deflate(), % the time consuming one as finale
+ large_deflate_do(), % the time consuming one as finale
ok;
worker_loop(N, FnATpl) ->
{F,A} = element(random:uniform(size(FnATpl)),FnATpl),