Merge branch 'dgud/test-cuddle' into maint

* dgud/test-cuddle:
  Test windows registry in places we are allowed to write
  test: do not divide by zero

3 files changed, 30 insertions, 25 deletions

diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index d71cedbdc5..151fab0a0e 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -164,7 +164,7 @@ bulk_send(Terms, BinSize) ->
     ?line stop_node(Node),
 
     ?line test_server:timetrap_cancel(Dog),
-    {comment, integer_to_list(trunc(Size/1024/Elapsed+0.5)) ++ " K/s"}.
+    {comment, integer_to_list(trunc(Size/1024/max(1,Elapsed)+0.5)) ++ " K/s"}.
 
 bulk_sendsend(Terms, BinSize) ->
     {Rate1, MonitorCount1} = bulk_sendsend2(Terms, BinSize,   5),
diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl
index dc8f0aaee9..d49ab3de4d 100644
--- a/erts/emulator/test/estone_SUITE.erl
+++ b/erts/emulator/test/estone_SUITE.erl
@@ -382,11 +382,11 @@ apply_micro(M) ->
      {weight_percentage, M#micro.weight},
      {loops, M#micro.loops},
      {microsecs,MicroSecs},
-     {estones, (M#micro.weight * M#micro.weight * ?STONEFACTOR) div MicroSecs},
+     {estones, (M#micro.weight * M#micro.weight * ?STONEFACTOR) div max(1,MicroSecs)},
      {gcs, GC1 - GC0},
      {kilo_word_reclaimed, (Words1 - Words0) div 1000},
      {kilo_reductions, Reds div 1000},
-     {gc_intensity, gci(Elapsed, GC1 - GC0, Words1 - Words0)}].
+     {gc_intensity, gci(max(1,Elapsed), GC1 - GC0, Words1 - Words0)}].
 
 monotonic_time() ->
     try erlang:monotonic_time() catch error:undef -> erlang:now() end.
diff --git a/lib/stdlib/test/win32reg_SUITE.erl b/lib/stdlib/test/win32reg_SUITE.erl
index 82baa43318..6d27ac6387 100644
--- a/lib/stdlib/test/win32reg_SUITE.erl
+++ b/lib/stdlib/test/win32reg_SUITE.erl
@@ -49,48 +49,53 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     Config.
 
+
 long(doc) -> "Test long keys and entries (OTP-3446).";
 long(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    Dog = test_server:timetrap(test_server:seconds(10)),
 
-    ?line LongKey = "software\\" ++
+    LongKey = "software\\" ++
 	lists:flatten(lists:duplicate(10, "..\\software\\")) ++
 	"Ericsson\\Erlang",
-    ?line {ok,Reg} = win32reg:open([read,write]),
-    ?line ok = win32reg:change_key(Reg, "\\hklm"),
-    ?line ok = win32reg:change_key(Reg, LongKey),
-    ?line {ok,ErlangKey} = win32reg:current_key(Reg),
-    io:format("Erlang key: ~s", [ErlangKey]),
+    {ok,Read} = win32reg:open([read]),
+    ok = win32reg:change_key(Read, "\\hklm"),
+
+    ok = win32reg:change_key(Read, LongKey),
+    {ok,ErlangKey} = win32reg:current_key(Read),
+    io:format("Erlang key: ~s~n", [ErlangKey]),
+    ok = win32reg:close(Read),
 
+    {ok,Reg} = win32reg:open([read, write]),
     %% Write a long value and read it back.
-    ?line TestKey = "test_key",
-    ?line LongValue = lists:concat(["This is a long value generated by the test case ",?MODULE,":long/1. "|lists:duplicate(128, "a")]),
-    ?line ok = win32reg:set_value(Reg, TestKey, LongValue),
-    ?line {ok,LongValue} = win32reg:value(Reg, TestKey),
+    TestKey = "test_key",
+    LongValue = lists:concat(["This is a long value generated by the test case ",?MODULE,":long/1. "|lists:duplicate(128, "a")]),
+    ok = win32reg:set_value(Reg, TestKey, LongValue),
+    {ok,LongValue} = win32reg:value(Reg, TestKey),
 
+    io:format("Where ~p Key ~s Value ~s ~n", [win32reg:current_key(Reg), TestKey, LongValue]),
     %% Done.
 
-    ?line ok = win32reg:close(Reg),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = win32reg:close(Reg),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 evil_write(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    Dog = test_server:timetrap(test_server:seconds(10)),
 
-    ?line Key = "Software\\Ericsson\\Erlang",
-    ?line {ok,Reg} = win32reg:open([read,write]),
-    ?line ok = win32reg:change_key(Reg, "\\hklm"),
-    ?line ok = win32reg:change_key(Reg, Key),
-    ?line {ok,ErlangKey} = win32reg:current_key(Reg),
+    Key = "Software\\Ericsson\\Erlang",
+    {ok,Reg} = win32reg:open([read,write]),
+    ok = win32reg:change_key(Reg, "\\hkcu"),
+    ok = win32reg:change_key_create(Reg, Key),
+    {ok,ErlangKey} = win32reg:current_key(Reg),
     io:format("Erlang key: ~s", [ErlangKey]),
 
     %% Write keys with different length and read it back.
-    ?line TestKey = "test_key " ++ lists:duplicate(128, $a),
+    TestKey = "test_key " ++ lists:duplicate(128, $a),
     evil_write_1(Reg, TestKey),
 
     %% Done.
-    ?line ok = win32reg:close(Reg),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = win32reg:close(Reg),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 evil_write_1(Reg, [_|[_|_]=Key]=Key0) ->