aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-09-06 10:29:34 +0200
committerLukas Larsson <[email protected]>2016-09-06 10:29:34 +0200
commitaf1e8c27b269c8750ed976ce8667967798f429e8 (patch)
tree1891fd0792f896cdcb0e6ae24153ce9b0fdb3edd /lib
parent3b8dbae4bc8771943c96492a23e773e377e614b3 (diff)
parenteaa2743cd558e409b091c9dfb3852197d89edf1c (diff)
downloadotp-af1e8c27b269c8750ed976ce8667967798f429e8.tar.gz
otp-af1e8c27b269c8750ed976ce8667967798f429e8.tar.bz2
otp-af1e8c27b269c8750ed976ce8667967798f429e8.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-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]),