diff options
| author | Lukas Larsson <[email protected]> | 2016-09-06 10:29:24 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-09-06 10:29:24 +0200 |
| commit | eaa2743cd558e409b091c9dfb3852197d89edf1c (patch) | |
| tree | abac18267a0d199b2416e853cac62f5b5e5ad96e /lib | |
| parent | 38975f5ffe2edd9e8bd916a6c31f80a60bb98e96 (diff) | |
| parent | 72b7794b3b234acd067eceb7b861b154ab1e1640 (diff) | |
| download | otp-eaa2743cd558e409b091c9dfb3852197d89edf1c.tar.gz otp-eaa2743cd558e409b091c9dfb3852197d89edf1c.tar.bz2 otp-eaa2743cd558e409b091c9dfb3852197d89edf1c.zip | |
Merge branch 'lukas/ts/no_flush_on_halt' into maint
* lukas/ts/no_flush_on_halt:
ts: Don't flush port when ending test run
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/test_server/ts_run.erl | 2 |
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]), |