aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-07-05 12:26:49 +0200
committerLukas Larsson <[email protected]>2016-07-05 12:26:49 +0200
commit72b7794b3b234acd067eceb7b861b154ab1e1640 (patch)
tree4c5bd370df0bb039191d59d9652d20b3dca2013d
parent30e1d890e37ffd57bfbcf043b3b982c781139418 (diff)
downloadotp-72b7794b3b234acd067eceb7b861b154ab1e1640.tar.gz
otp-72b7794b3b234acd067eceb7b861b154ab1e1640.tar.bz2
otp-72b7794b3b234acd067eceb7b861b154ab1e1640.zip
ts: Don't flush port when ending test run
Sometimes there are hanging ports left after a test run, we don't want the emulator to be left haning if that happens after a test run.
-rw-r--r--lib/common_test/test_server/ts_run.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl
index 66db1ff9a7..82ae44ec06 100644
--- a/lib/common_test/test_server/ts_run.erl
+++ b/lib/common_test/test_server/ts_run.erl
@@ -258,7 +258,7 @@ make_command(Vars, Spec, State) ->
run_batch(Vars, _Spec, State) ->
process_flag(trap_exit, true),
- Command = State#state.command ++ " -noinput -s erlang halt",
+ Command = State#state.command ++ " -noinput -eval \"erlang:halt(0,[{flush,false}]).\"",
ts_lib:progress(Vars, 1, "Command: ~ts~n", [Command]),
io:format(user, "Command: ~ts~n",[Command]),
Port = open_port({spawn, Command}, [stream, in, eof, exit_status]),