Merge branch 'lukas/erts/testfixes-19'

* lukas/erts/testfixes-19:
  erts: Increase bif and nif call_time trace test
  erts: Fix distribution_SUITE:bulk_send_bigbig on windows
  erts: Ensure bs_add_overflow test has enough memory
  kernel: Better explain controlling_process' tcp behaviour
  kernel: Fix t_recv_delim on bsd
  os_mon: Make sure to start/stop os_mon in tests correctly
  ssl: Fix use_interface dist_SSL test
  erl_interface: Fix signed int overflow tc bug
  erts: fix atom_roundtrip_r15b tc
  erts: Require more memory for debug tests

1 files changed, 14 insertions, 6 deletions

diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 26780f6017..c6939a695d 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -187,8 +187,13 @@ bulk_sendsend2(Terms, BinSize, BusyBufSize) ->
     {ok, NodeSend} = start_node(bulk_sender, "+zdbbl " ++ integer_to_list(BusyBufSize)),
     _Send = spawn(NodeSend, erlang, apply, [fun sendersender/4, [self(), Recv, Bin, Terms]]),
     {Elapsed, {_TermsN, SizeN}, MonitorCount} =
-    receive {sendersender, BigRes} ->
-                BigRes
+    receive
+        %% On some platforms (windows), the time taken is 0 so we
+        %% simulate that some little time has passed.
+        {sendersender, {0.0,T,MC}} ->
+            {0.0015, T, MC};
+        {sendersender, BigRes} ->
+            BigRes
     end,
     stop_node(NodeRecv),
     stop_node(NodeSend),
@@ -1042,10 +1047,13 @@ atom_roundtrip_r15b(Config) when is_list(Config) ->
             ct:timetrap({minutes, 6}),
             AtomData = atom_data(),
             verify_atom_data(AtomData),
-            {ok, Node} = start_node(Config, [], "r15b"),
-            do_atom_roundtrip(Node, AtomData),
-            stop_node(Node),
-            ok;
+            case start_node(Config, [], "r15b") of
+                {ok, Node} ->
+                    do_atom_roundtrip(Node, AtomData),
+                    stop_node(Node);
+                {error, timeout} ->
+                    {skip,"Unable to start OTP R15B release"}
+            end;
         false ->
             {skip,"No OTP R15B available"}
     end.