aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/test
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-04-19 10:57:55 +0200
committerSiri Hansen <[email protected]>2013-04-19 10:57:55 +0200
commiteb325ef3414c7c019eb9541e8d6ab4ce46632e65 (patch)
treeed7ae228584fda71d7379106d98827b4164875a1 /lib/reltool/test
parentb31b467e902c978284eaeca6a23e336d2301f42a (diff)
parentafb553a6d776ff751311b950a96b2708a9ee292b (diff)
downloadotp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.tar.gz
otp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.tar.bz2
otp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.zip
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests: [common_test] Adjusted timers in ct_repeat_testrun_SUITE [common_test] Extend timer in cover_SUITE for slow test host [sasl] Remove compiler warning in release_handler_SUITE [common_test] Kill slave nodes after test cases in cover_SUITE [reltool] Remove erlang:port_close/1 for node port
Diffstat (limited to 'lib/reltool/test')
-rw-r--r--lib/reltool/test/reltool_server_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index b1e1787f18..752037042d 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -2595,8 +2595,8 @@ start_node(Name, ErlPath, Args0) ->
%io:format("open_port({spawn_executable, ~p}, [{args,~p}])~n",[ErlPath,Args]),
case open_port({spawn_executable, ErlPath}, [{args,Args}]) of
Port when is_port(Port) ->
- unlink(Port),
- erlang:port_close(Port),
+ %% no need to close port since node is detached (see
+ %% mk_node_args) so port will be closed anyway.
case ping_node(FullName, 50) of
ok -> {ok, FullName};
Other -> exit({failed_to_start_node, FullName, Other})
@@ -2629,7 +2629,7 @@ mk_node_args(Name, Args) ->
end,
{ok, Pwd} = file:get_cwd(),
NameStr = atom_to_list(Name),
- ["-detached", "-noinput",
+ ["-detached",
NameSw, NameStr,
"-pa", Pa,
"-env", "ERL_CRASH_DUMP", Pwd ++ "/erl_crash_dump." ++ NameStr,