diff options
| author | Sverker Eriksson <[email protected]> | 2013-11-27 11:48:52 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-11-27 11:48:52 +0100 |
| commit | f0b04f4e9a08c30fd948b1104ed0d5720012fbd8 (patch) | |
| tree | 917af954b099aa2608260fe0558133a40d1a7c11 | |
| parent | 7211a984fc82b6c1dd8f710af15674ee7112ff53 (diff) | |
| parent | 272ffa2e678fb4d118cf4b78d1fb0c4f3f8d8f94 (diff) | |
| download | otp-f0b04f4e9a08c30fd948b1104ed0d5720012fbd8.tar.gz otp-f0b04f4e9a08c30fd948b1104ed0d5720012fbd8.tar.bz2 otp-f0b04f4e9a08c30fd948b1104ed0d5720012fbd8.zip | |
Merge branch 'sverk/zlib_SUITE-large_deflate-fix' into maint
* sverk/zlib_SUITE-large_deflate-fix:
kernel: Fix zlib_SUITE:large_deflate
| -rw-r--r-- | lib/kernel/test/zlib_SUITE.erl | 8 |
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), |