Merge branch 'dev' into major

* dev:
  distribution_SUITE:bulk_send_bigbig/1: Fail with more information
  distribution_SUITE: Use unique slave node names
  beam_lib: Handle rare race in the crypto key server functionality
  busy_port_SUITE: Avoid crash in register/2
  [wx] Re-generate code
  [wx] Remove optional shadowing clauses
  [wx] Remove warning
  [wx] Fix trailing whitespace
  [wx] Test colors in textctrl
  [wx] Fix cleanup memory references

2 files changed, 31 insertions, 12 deletions

diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl
index 8365e1c540..dac2a70f59 100644
--- a/erts/emulator/test/busy_port_SUITE.erl
+++ b/erts/emulator/test/busy_port_SUITE.erl
@@ -20,7 +20,7 @@
 -module(busy_port_SUITE).
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
+	 init_per_group/2,end_per_group/2,end_per_testcase/2,
 	 io_to_busy/1, message_order/1, send_3/1, 
 	 system_monitor/1, no_trap_exit/1,
 	 no_trap_exit_unlinked/1, trap_exit/1, multiple_writers/1,
@@ -53,6 +53,20 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+end_per_testcase(_Case, Config) when is_list(Config) ->
+    case whereis(busy_drv_server) of
+	undefined ->
+	    ok;
+	Pid when is_pid(Pid) ->
+	    Ref = monitor(process, Pid),
+	    unlink(Pid),
+	    exit(Pid, kill),
+	    receive
+		{'DOWN',Ref,process,Pid,_} ->
+		    ok
+	    end
+    end,
+    Config.
 
 %% Tests I/O operations to a busy port, to make sure a suspended send
 %% operation is correctly restarted.  This used to crash Beam.
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index e4af5c00a6..3eaacdb044 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -173,15 +173,20 @@ bulk_sendsend(Terms, BinSize) ->
     Ratio = if MonitorCount2 == 0 -> MonitorCount1 / 1.0;
                true               -> MonitorCount1 / MonitorCount2
             end,
-    %% A somewhat arbitrary ratio, but hopefully one that will accommodate
-    %% a wide range of CPU speeds.
-    true = (Ratio > 8.0),
-    {comment,
-     integer_to_list(Rate1) ++ " K/s, " ++
-     integer_to_list(Rate2) ++ " K/s, " ++
-     integer_to_list(MonitorCount1) ++ " monitor msgs, " ++
-     integer_to_list(MonitorCount2) ++ " monitor msgs, " ++
-     float_to_list(Ratio) ++ " monitor ratio"}.    
+    Comment = integer_to_list(Rate1) ++ " K/s, " ++
+	integer_to_list(Rate2) ++ " K/s, " ++
+	integer_to_list(MonitorCount1) ++ " monitor msgs, " ++
+	integer_to_list(MonitorCount2) ++ " monitor msgs, " ++
+	float_to_list(Ratio) ++ " monitor ratio",
+    if
+	%% A somewhat arbitrary ratio, but hopefully one that will
+	%% accommodate a wide range of CPU speeds.
+	Ratio > 8.0 ->
+	    {comment,Comment};
+	true ->
+	    io:put_chars(Comment),
+	    ?line ?t:fail(ratio_too_low)
+    end.
 
 bulk_sendsend2(Terms, BinSize, BusyBufSize) ->
     ?line Dog = test_server:timetrap(test_server:seconds(30)),
@@ -1597,8 +1602,8 @@ bad_dist_ext_control(Config) when is_list(Config) ->
     ?line stop_node(Victim).
 
 bad_dist_ext_connection_id(Config) when is_list(Config) ->
-    ?line {ok, Offender} = start_node(bad_dist_ext_receive_offender),
-    ?line {ok, Victim} = start_node(bad_dist_ext_receive_victim),
+    ?line {ok, Offender} = start_node(bad_dist_ext_connection_id_offender),
+    ?line {ok, Victim} = start_node(bad_dist_ext_connection_id_victim),
     ?line start_node_monitors([Offender,Victim]),
 
     ?line Parent = self(),