diff options
| author | Björn Gustavsson <[email protected]> | 2014-01-22 16:19:32 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-01-22 16:19:32 +0100 |
| commit | e99633a51cbd22b16606c2669c575c22cf1c511f (patch) | |
| tree | 784ef6b3eec7461e7b8962fee2d1ba6858b516b6 /lib/kernel/test/zlib_SUITE.erl | |
| parent | 990b655c92f889d2c45e6f43ee6fdae29ffc8464 (diff) | |
| parent | 9f57d8c4f86323cf7481c9a7e512486087bb5542 (diff) | |
| download | otp-e99633a51cbd22b16606c2669c575c22cf1c511f.tar.gz otp-e99633a51cbd22b16606c2669c575c22cf1c511f.tar.bz2 otp-e99633a51cbd22b16606c2669c575c22cf1c511f.zip | |
Merge branch 'bjorn/erts/zlib-1.2.8'
* bjorn/erts/zlib-1.2.8:
configure: Prefer the system's zlib over own our zlib source
Update preloaded modules
Add the 'rle' zstrategy
Don't make gzio.c dependent on the zutil.h header file
Update zlib to 1.2.8
erts/zlib: Remove unused file example.c
Diffstat (limited to 'lib/kernel/test/zlib_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/zlib_SUITE.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl index e91f6f18d4..3be6f39d95 100644 --- a/lib/kernel/test/zlib_SUITE.erl +++ b/lib/kernel/test/zlib_SUITE.erl @@ -178,7 +178,7 @@ api_deflateInit(Config) when is_list(Config) -> ?m(ok,zlib:close(Z)) end, lists:seq(1,8)), - Strategies = [filtered,huffman_only,default], + Strategies = [filtered,huffman_only,rle,default], lists:foreach(fun(Strategy) -> ?line Z = zlib:open(), ?m(ok, zlib:deflateInit(Z,best_speed,deflated,-15,8,Strategy)), @@ -220,7 +220,6 @@ api_deflateParams(Config) when is_list(Config) -> ?m(_, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, none)), ?m(ok, zlib:deflateParams(Z1, best_compression, huffman_only)), ?m(_, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, sync)), - ?m({'EXIT',_}, zlib:deflateParams(Z1,best_speed, filtered)), ?m(ok, zlib:close(Z1)). api_deflate(doc) -> "Test deflate"; |