From 48d6955eca25d2d9fec0a0a6a4c70ef6ddb85e41 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Mon, 7 Mar 2016 19:02:58 +0100
Subject: stdlib: Fix io_SUITE:bad_printable_range for windows

avoid os:cmd as it treats stderr different on windows.
---
 lib/stdlib/test/io_SUITE.erl | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'lib/stdlib/test')

diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 0e897631ff..bb1ed2a4fc 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -2125,12 +2125,24 @@ rpc_call_max(Node, M, F, Args) ->
 %% Make sure that a bad specification for a printable range is rejected.
 bad_printable_range(Config) when is_list(Config) ->
     Cmd = lists:concat([lib:progname()," +pcunnnnnicode -run erlang halt"]),
-    case os:cmd(Cmd) of
-	"bad range of printable characters" ++ _ ->
-	    ok;
-	String ->
-	    io:format("~s\n", [String]),
-	    ?t:fail()
+    P = open_port({spawn, Cmd}, [stderr_to_stdout, {line, 200}]),
+    ok = receive
+	     {P, {data, {eol , "bad range of printable characters" ++ _}}} ->
+		 ok;
+	     Other ->
+		 Other
+	 after 1000 ->
+		 timeout
+	 end,
+    catch port_close(P),
+    flush_from_port(P),
+    ok.
+
+flush_from_port(P) ->
+    receive {P, _} ->
+	    flush_from_port(P)
+    after 0 ->
+	    ok
     end.
 
 io_lib_print_binary_depth_one(doc) ->
-- 
cgit v1.2.3


From 3f9e87c76d4d5ec4daa9cff108e9c30346159a65 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Fri, 4 Mar 2016 09:43:03 +0100
Subject: Test windows registry in places we are allowed to write

Since Windows 8 we are not allowed (in non elevated mode) to
write to hklm.
---
 lib/stdlib/test/win32reg_SUITE.erl | 49 +++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 22 deletions(-)

(limited to 'lib/stdlib/test')

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) ->
-- 
cgit v1.2.3