diff options
| author | Siri Hansen <[email protected]> | 2011-06-17 14:39:52 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-06-17 14:39:52 +0200 |
| commit | aa5fb1df25e9f37f798a00ec6206838d73306968 (patch) | |
| tree | 11040b550a41194808a2a7e31dc468802eef46c3 /lib/sasl/test/release_handler_SUITE.erl | |
| parent | 27e7370716c7f97754d0cd8e77deb637f96521e6 (diff) | |
| parent | 03842c215fa5cd90ea72bc135e29a25065199e4e (diff) | |
| download | otp-aa5fb1df25e9f37f798a00ec6206838d73306968.tar.gz otp-aa5fb1df25e9f37f798a00ec6206838d73306968.tar.bz2 otp-aa5fb1df25e9f37f798a00ec6206838d73306968.zip | |
Merge branch 'siri/sasl/release_handler-windows/OTP-9306' into dev
* siri/sasl/release_handler-windows/OTP-9306:
Remove path to erts bin dir from erlsrv arguments
Diffstat (limited to 'lib/sasl/test/release_handler_SUITE.erl')
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE.erl | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl index d56c90d979..16267ba0d4 100644 --- a/lib/sasl/test/release_handler_SUITE.erl +++ b/lib/sasl/test/release_handler_SUITE.erl @@ -1039,17 +1039,17 @@ delete_release(Conf) -> ?t:format("======== deleting ~p~n",[Dirs]), ok = delete_release_os(Dirs--["save"]), - {ok,Remaining} = file:list_dir(PrivDir), + {ok,Remaining} = file:list_dir(PrivDir), ?t:format("======== remaining ~p~n",[Remaining]), - case Remaining of - [] -> ok; + case Remaining of + [] -> + ok; _ -> - delete_release_os(Remaining), - Remaining2 = file:list_dir(PrivDir), - ?t:format("======== remaining after second try ~p~n",[Remaining2]) - end, - + delete_release_os(Remaining), + Remaining2 = file:list_dir(PrivDir), + ?t:format("======== remaining after second try ~p~n",[Remaining2]) + end, ok = file:set_cwd(OrigWd), ok. @@ -1608,8 +1608,7 @@ start_node_win32(Sname,NodeDir) -> ErtsBinDir = filename:join(NodeDir,"erts-4.4/bin"), StartErlArgs = rh_test_lib:get_start_erl_args(NodeDir), - ServiceArgs = rh_test_lib:get_service_args("4.4", NodeDir, Sname, - StartErlArgs), + ServiceArgs = rh_test_lib:get_service_args(NodeDir, Sname, StartErlArgs), Erlsrv = filename:nativename(filename:join(ErtsBinDir,"erlsrv")), rh_test_lib:erlsrv(Erlsrv,stop,Name), |