7 files changed, 44 insertions, 8 deletions

diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index e43be77428..f630896e03 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -230,7 +230,7 @@ time_ping(Node) ->
     T0 = erlang:monotonic_time(),
     pang = net_adm:ping(Node),
     T1 = erlang:monotonic_time(),
-    erlang:convert_time_unit(T1 - T0, native, milli_seconds).
+    erlang:convert_time_unit(T1 - T0, native, millisecond).
 
 %% Keep the connection with the client node up.
 %% This is neccessary as the client node runs with much shorter
@@ -274,7 +274,7 @@ tick_cli_test1(Node) ->
 	    receive
 		{whats_the_result, From} ->
 		    Diff = erlang:convert_time_unit(T2-T1, native,
-						    milli_seconds),
+						    millisecond),
 		    case Diff of
 			T when T > 8000, T < 16000 ->
 			    From ! {tick_test, T};
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index c37d114a58..f2094431d8 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -3738,7 +3738,7 @@ response_analysis(Module, Function, Arguments) ->
     {Result, Comment}.
 
 micro_ts() ->
-    erlang:monotonic_time(micro_seconds).
+    erlang:monotonic_time(microsecond).
 
 response_stat(init, Ts) ->
     {0, 0, Ts, 0, 0};
diff --git a/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c b/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
index 2990ddda41..b91dca61d4 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
+++ b/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
@@ -17,7 +17,7 @@
  *
  * %CopyrightEnd%
  */
-#include "erl_nif.h"
+#include <erl_nif.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 6b64c83fc2..929f66d400 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -1914,7 +1914,7 @@ so_priority(Config) when is_list(Config) ->
 %% Accept test utilities (suites are below)
 
 millis() ->
-    erlang:monotonic_time(milli_seconds).
+    erlang:monotonic_time(millisecond).
 	
 collect_accepts(0,_) -> [];
 collect_accepts(N,Tmo) ->
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index fc3706ba1e..298a364a91 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -711,7 +711,7 @@ toerl_loop(Port,Acc) ->
     end.
 
 millistamp() ->
-    erlang:monotonic_time(milli_seconds).
+    erlang:monotonic_time(millisecond).
 
 get_data_within(Port, X, Acc) when X =< 0 ->
     ?dbg({get_data_within, X, Acc, ?LINE}),
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index e76d6ec482..3cbb75a633 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -322,7 +322,7 @@ perf_counter_api(_Config) ->
     T1 = os:perf_counter(),
     timer:sleep(100),
     T2 = os:perf_counter(),
-    TsDiff = erlang:convert_time_unit(T2 - T1, perf_counter, nano_seconds),
+    TsDiff = erlang:convert_time_unit(T2 - T1, perf_counter, nanosecond),
     ct:pal("T1: ~p~n"
            "T2: ~p~n"
            "TsDiff: ~p~n",
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index f8257bd20c..4b67fce9a8 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -83,7 +83,7 @@ groups() ->
       [api_open_close, api_deflateInit,
        api_deflateSetDictionary, api_deflateReset,
        api_deflateParams, api_deflate, api_deflateEnd,
-       api_inflateInit, api_inflateSetDictionary,
+       api_inflateInit, api_inflateSetDictionary, api_inflateGetDictionary,
        api_inflateSync, api_inflateReset, api_inflate, api_inflateChunk,
        api_inflateEnd, api_setBufsz, api_getBufsz, api_crc32,
        api_adler32, api_getQSize, api_un_compress, api_un_zip,
@@ -288,6 +288,42 @@ api_inflateSetDictionary(Config) when is_list(Config) ->
     ?m({'EXIT',{stream_error,_}}, zlib:inflateSetDictionary(Z1,Dict)),
     ?m(ok, zlib:close(Z1)).
 
+%% Test inflateGetDictionary.
+api_inflateGetDictionary(Config) when is_list(Config) ->
+    Z1 = zlib:open(),
+    IsOperationSupported =
+        case catch zlib:inflateGetDictionary(Z1) of
+            {'EXIT',{einval,_}} -> true;
+            {'EXIT',{enotsup,_}} -> false
+        end,
+    _ = zlib:close(Z1),
+    api_inflateGetDictionary_if_supported(IsOperationSupported).
+
+api_inflateGetDictionary_if_supported(false) ->
+    {skip, "inflateGetDictionary/1 unsupported in current setup"};
+api_inflateGetDictionary_if_supported(true) ->
+    % Compress payload using custom dictionary
+    Z1 = zlib:open(),
+    ?m(ok, zlib:deflateInit(Z1)),
+    Dict = <<"foobar barfoo foo bar far boo">>,
+    ?m(_, zlib:deflateSetDictionary(Z1, Dict)),
+    Payload = <<"foobarbarbar">>,
+    Compressed = zlib:deflate(Z1, Payload, finish),
+    ?m(ok, zlib:close(Z1)),
+
+    % Decompress and test dictionary extraction
+    Z2 = zlib:open(),
+    ?m(ok, zlib:inflateInit(Z2)),
+    ?m(<<>>, iolist_to_binary(zlib:inflateGetDictionary(Z2))),
+    ?m({'EXIT',{stream_error,_}}, zlib:inflateSetDictionary(Z2, Dict)),
+    ?m({'EXIT',{{need_dictionary,_},_}}, zlib:inflate(Z2, Compressed)),
+    ?m(ok, zlib:inflateSetDictionary(Z2, Dict)),
+    ?m(Dict, iolist_to_binary(zlib:inflateGetDictionary(Z2))),
+    ?m(Payload, iolist_to_binary(zlib:inflate(Z2, Compressed))),
+    ?m(ok, zlib:close(Z2)),
+    ?m(?BARG, zlib:inflateSetDictionary(Z2, Dict)),
+    ok.
+
 %% Test inflateSync.
 api_inflateSync(Config) when is_list(Config) ->
     {skip,"inflateSync/1 sucks"}.