Make release_handler work with windows services

This commit adds test cases from release_handler_SUITE on windows,
including some corrections in erlsrv and release_handler.

1 files changed, 100 insertions, 0 deletions

diff --git a/lib/sasl/test/rh_test_lib.erl b/lib/sasl/test/rh_test_lib.erl
new file mode 100644
index 0000000000..f192f4d585
--- /dev/null
+++ b/lib/sasl/test/rh_test_lib.erl
@@ -0,0 +1,100 @@
+-module(rh_test_lib).
+
+-export([erlsrv/3,
+	 erlsrv/4]).
+-export([get_service_args/4,
+	 get_service_args/5,
+	 get_start_erl_args/1,
+	 get_start_erl_args/3,
+	 get_client_args/3,
+	 get_client_args/4]).
+
+
+erlsrv(Erlsrv,Action,Name) ->
+    erlsrv(Erlsrv,Action,Name,"").
+erlsrv(Erlsrv,Action,Name,Rest) ->
+    Cmd = Erlsrv ++ " " ++ atom_to_list(Action) ++ " " ++ Name ++ " " ++ Rest,
+    io:format("erlsrv cmd: ~p~n",[Cmd]),
+    Port = open_port({spawn, Cmd}, [stream, {line, 100}, eof, in]),
+    Res = recv_prog_output(Port),
+    case Res of
+	[] ->
+	    failed;
+	_Y ->
+	    io:format("erlsrv res: ~p~n",[_Y]),
+	    ok
+    end.
+
+recv_prog_output(Port) ->
+    receive
+	{Port, {data, {eol,Data}}} ->
+	    %%io:format("Got data: ~s~n", [Data]),
+	    [ Data, "\n" | recv_prog_output(Port)];
+	{Port, {data, {noeol,Data}}} ->
+	    %%io:format("Got data: ~s~n", [Data]),
+	    [ Data | recv_prog_output(Port)];
+	{Port, _Other} ->
+	    %%io:format("Got ~p from port~n", [_Other]),
+	    Port ! {self(), close},
+	    receive
+		{Port,closed} ->
+		    []
+	    end
+    end.
+
+get_service_args(EVsn, RootDir, Sname, StartErlArgs) ->
+    get_service_args(EVsn, RootDir, "", Sname, StartErlArgs).
+get_service_args(EVsn, RootDir, RelClientDir, Sname, StartErlArgs) ->
+    ErtsBinDir = filename:join([RootDir,"erts-"++EVsn,"bin"]),
+    StartErl = filename:nativename(filename:join(ErtsBinDir,"start_erl")),
+    LogDir = filename:nativename(filename:join([RootDir,RelClientDir,"log"])),
+    HeartCmd = filename:nativename(filename:join(ErtsBinDir,"heart_restart.bat")),
+    " -machine " ++ StartErl ++ " -workdir " ++ LogDir ++
+	" -debugtype new -sname " ++ atom_to_list(Sname) ++
+	" -env HEART_COMMAND=" ++ HeartCmd ++ " -args \"" ++ StartErlArgs ++ "\"".
+
+get_start_erl_args(RootDir) ->
+    get_start_erl_args(RootDir,"","").
+get_start_erl_args(RootDir,RelClientDir,ExtraArgs) ->
+    Cookie = atom_to_list(erlang:get_cookie()),
+    RelDir = filename:join([RootDir,RelClientDir,"releases"]),
+    ExtraArgs ++ " -setcookie " ++ Cookie ++
+	" -heart ++ -rootdir " ++ filename:nativename(RootDir) ++
+	" -reldir " ++ filename:nativename(RelDir).
+
+%% Must be called on the master node
+get_client_args(Client,Sname,RootDir) ->
+    get_client_args(Client,Sname,RootDir,node()).
+get_client_args(Client,Sname,RootDir,Master) ->
+    {ok,Host} = inet:gethostname(),
+    Node = atom_to_list(Sname) ++ "@" ++ Host,
+    RelClientDir = filename:join(["clients","type1",Node]),
+    ClientDir = filename:join([RootDir,RelClientDir]),
+    StartPrg = filename:join([ClientDir,"bin","start"]),
+    {" -sasl start_prg \\\\\\\"" ++ StartPrg ++ "\\\\\\\" masters \[" ++
+	 single_quote() ++ atom_to_list(Master) ++ single_quote() ++
+	 get_client_extra_master(Client,Host) ++
+	 "\] client_directory \\\\\\\"" ++ ClientDir ++  "\\\\\\\"" ++
+	 get_client_loader_args(Client,Sname,Host),
+     RelClientDir}.
+
+get_client_loader_args(client1,Sname,Host) ->
+    {ok,IpTuple} = inet:getaddr(Host,inet),
+    IpAddr =  inet_parse:ntoa(IpTuple),
+    " -loader inet -id " ++
+	atom_to_list(Sname) ++ " -hosts " ++ IpAddr;
+get_client_loader_args(_,_,_) ->
+    "".
+
+get_client_extra_master(client2,Host) ->
+    "," ++ single_quote() ++ "master2@" ++ Host ++ single_quote();
+get_client_extra_master(_,_) ->
+    "".
+
+single_quote() ->
+    case os:type() of
+	{win32,_} ->
+	    "\'";
+	_ ->
+	    "\\'"
+    end.