diff options
| author | Zandra Hird <[email protected]> | 2015-03-17 09:07:34 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-17 09:08:06 +0100 |
| commit | 29a1d1169f84c591c5d39175a1ad683449f0f727 (patch) | |
| tree | 6e665aab9825e83634868248f71e0cef1335f67c /lib | |
| parent | da0cfbabbae668bcacbf3e5fff1ebdc173e6f1e1 (diff) | |
| parent | 7d82a632f4837764ac79dfb4986d102060bd3080 (diff) | |
| download | otp-29a1d1169f84c591c5d39175a1ad683449f0f727.tar.gz otp-29a1d1169f84c591c5d39175a1ad683449f0f727.tar.bz2 otp-29a1d1169f84c591c5d39175a1ad683449f0f727.zip | |
Merge branch 'essen/zlib-windowbits'
* essen/zlib-windowbits:
Update zlib:zwindowbits/0 type to accept 8 and -8
OTP-12564
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/test/zlib_SUITE.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl index e99151284f..41c19fce51 100644 --- a/lib/kernel/test/zlib_SUITE.erl +++ b/lib/kernel/test/zlib_SUITE.erl @@ -146,8 +146,6 @@ api_deflateInit(Config) when is_list(Config) -> ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-20,8,default)), ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-7,8,default)), ?m(?BARG, zlib:deflateInit(Z1,default,deflated,7,8,default)), - ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-8,8,default)), - ?m(?BARG, zlib:deflateInit(Z1,default,deflated,8,8,default)), ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-15,0,default)), ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-15,10,default)), @@ -169,7 +167,7 @@ api_deflateInit(Config) when is_list(Config) -> ?m(ok, zlib:deflateInit(Z12,default,deflated,-Wbits,8,default)), ?m(ok,zlib:close(Z11)), ?m(ok,zlib:close(Z12)) - end, lists:seq(9, 15)), + end, lists:seq(8, 15)), lists:foreach(fun(MemLevel) -> ?line Z = zlib:open(), @@ -277,7 +275,7 @@ api_inflateInit(Config) when is_list(Config) -> ?m(ok, zlib:inflateInit(Z12,-Wbits)), ?m(ok,zlib:close(Z11)), ?m(ok,zlib:close(Z12)) - end, lists:seq(9,15)), + end, lists:seq(8,15)), ?m(?BARG, zlib:inflateInit(gurka, -15)), ?m(?BARG, zlib:inflateInit(Z1, 7)), ?m(?BARG, zlib:inflateInit(Z1, -7)), |