3 files changed, 34 insertions, 7 deletions
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index c604e7073f..4218cfa646 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -91,6 +91,8 @@
 
 -export([standard_io/1,mini_server/1]).
 
+-export([old_io_protocol/1]).
+
 %% Debug exports
 -export([create_file_slow/2, create_file/2, create_bin/2]).
 -export([verify_file/2, verify_bin/3]).
@@ -114,7 +116,7 @@ all() ->
      delayed_write, read_ahead, segment_read, segment_write,
      ipread, pid2name, interleaved_read_write, otp_5814, otp_10852,
      large_file, large_write, read_line_1, read_line_2, read_line_3,
-     read_line_4, standard_io].
+     read_line_4, standard_io, old_io_protocol].
 
 groups() -> 
     [{dirs, [], [make_del_dir, cur_dir_0, cur_dir_1,
@@ -310,6 +312,31 @@ standard_io(Config) when is_list(Config) ->
     Pid ! die,
     receive after 1000 -> ok end.
 
+old_io_protocol(suite) ->
+    [];
+old_io_protocol(doc) ->
+    ["Test that the old file IO protocol =< R16B still works"];
+old_io_protocol(Config) when is_list(Config) ->
+    Dog = test_server:timetrap(test_server:seconds(5)),
+    RootDir = ?config(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"old_io_protocol.fil"),
+    MyData = "0123456789abcdefghijklmnopqrstuvxyz",
+    ok = ?FILE_MODULE:write_file(Name, MyData),
+    {ok, Fd} = ?FILE_MODULE:open(Name, write),
+    Fd ! {file_request,self(),Fd,truncate},
+    receive
+	{file_reply,Fd,ok} -> ok
+    end,
+    ok = ?FILE_MODULE:close(Fd),
+    {ok, <<>>} = ?FILE_MODULE:read_file(Name),
+    test_server:timetrap_cancel(Dog),
+    [] = flush(),
+    ok.
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 read_write_file(suite) -> [];
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 2a886b2efc..c5d8becfd3 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -1399,8 +1399,7 @@ s_req(S, Req) ->
 	{'DOWN',Mref,_,_,Error} ->
 	    exit(Error);
 	{S,Mref,Reply} ->
-	    erlang:demonitor(Mref),
-	    receive {'DOWN',Mref,_,_,_} -> ok after 0 -> ok end,
+	    erlang:demonitor(Mref, [flush]),
 	    Reply
     end.
 
diff --git a/lib/kernel/test/global_SUITE_data/global_trace.erl b/lib/kernel/test/global_SUITE_data/global_trace.erl
index 4f253baac4..ddbe608c0a 100644
--- a/lib/kernel/test/global_SUITE_data/global_trace.erl
+++ b/lib/kernel/test/global_SUITE_data/global_trace.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -122,12 +123,12 @@ state(Else) ->
 %%%                              {ops,Ops}]
 %%%    NewKnown = Known ++ AddedNodes
 %%%    AddedNodes = NewNodes -- Known
-%%%    NewNodes �r h�r den man f�rhandlat med plus de noder den k�nner till.
+%%%    NewNodes är här den man förhandlat med plus de noder den känner till.
 %%% {added, AddedNodes}, Extra = [{ops,Ops}]
 %%%    NewKnown = Known ++ AddedNodes
-%%%    Den (passiva) noden f�r Nodes som �r NewNodes
-%%%    hos den f�rhandlande. Sedan: AddedNodes = (Nodes -- Known) -- [node()].
-%%%    Det �r som hos f�rhandlaren.
+%%%    Den (passiva) noden får Nodes som är NewNodes
+%%%    hos den förhandlande. Sedan: AddedNodes = (Nodes -- Known) -- [node()].
+%%%    Det är som hos förhandlaren.
 %%% {nodes_changed, {New,Old}}
 %%%    Every now and then the list [node() | nodes()] is checked for updates.
 %%%    New are the nodes that global does not know of (yet).