diff options
author | Sverker Eriksson <[email protected]> | 2012-03-20 11:51:57 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2012-03-20 11:51:57 +0100 |
commit | c93be7c2b7732ef6212186dd8107590805d1ca58 (patch) | |
tree | e68c88a79da5542843d9ada350043d4e6ac50a9b /lib/kernel | |
parent | 4e932ecacbb0c98b4ca0560c6bb0b72a5f267bd9 (diff) | |
parent | 46dd06a64dc5e14aec5921b293135713baa64059 (diff) | |
download | otp-c93be7c2b7732ef6212186dd8107590805d1ca58.tar.gz otp-c93be7c2b7732ef6212186dd8107590805d1ca58.tar.bz2 otp-c93be7c2b7732ef6212186dd8107590805d1ca58.zip |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/zlib.beam
Rebuilt zlib.beam as part of this merge commit
Diffstat (limited to 'lib/kernel')
-rw-r--r-- | lib/kernel/test/zlib_SUITE.erl | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl index 74bafe8935..e0fd0f5d19 100644 --- a/lib/kernel/test/zlib_SUITE.erl +++ b/lib/kernel/test/zlib_SUITE.erl @@ -73,6 +73,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [{group, api}, {group, examples}, {group, func}, smp, + otp_9981, otp_7359]. groups() -> @@ -964,6 +965,24 @@ otp_7359_def_inf(Data,{DefSize,InfSize}) -> ?line ok = zlib:close(ZInf), ok. +otp_9981(Config) when is_list(Config) -> + Ports = lists:sort(erlang:ports()), + Invalid = <<"My invalid data">>, + catch zlib:compress(invalid), + Ports = lists:sort(erlang:ports()), + catch zlib:uncompress(Invalid), + Ports = lists:sort(erlang:ports()), + catch zlib:zip(invalid), + Ports = lists:sort(erlang:ports()), + catch zlib:unzip(Invalid), + Ports = lists:sort(erlang:ports()), + catch zlib:gzip(invalid), + Ports = lists:sort(erlang:ports()), + catch zlib:gunzip(Invalid), + Ports = lists:sort(erlang:ports()), + ok. + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% Helps with testing directly %%%%%%%%%%%%% |