aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server_ctrl.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2012-09-27 12:02:04 +0200
committerDan Gudmundsson <[email protected]>2012-09-27 12:02:04 +0200
commit8a9c261282a2f9fd96c20b38b14b5e74a30b46c5 (patch)
tree466d537231096e23442e8be560b29e219a50ea58 /lib/test_server/src/test_server_ctrl.erl
parent3ea4a5934c104aada07a8c971c0a2fd74d1e26f8 (diff)
parent7e557788fed994a81672adfb25cf3846c56eb571 (diff)
downloadotp-8a9c261282a2f9fd96c20b38b14b5e74a30b46c5.tar.gz
otp-8a9c261282a2f9fd96c20b38b14b5e74a30b46c5.tar.bz2
otp-8a9c261282a2f9fd96c20b38b14b5e74a30b46c5.zip
Merge branch 'dgud/ct/fix-trashed-logs/OTP-10369'
* dgud/ct/fix-trashed-logs/OTP-10369: [ct] Shorten testcase names Shorten testcase names [ct] Block output into single io call
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
-rw-r--r--lib/test_server/src/test_server_ctrl.erl15
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index f7266e5632..9731f1ddba 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -4686,21 +4686,16 @@ output_to_fd(stdout, Msg, Sender) ->
io:format("Testing ~s: ~s\n", [Name, lists:flatten(Msg)]);
output_to_fd(undefined, _Msg, _Sender) ->
ok;
-output_to_fd(Fd, [$=|Msg], internal) ->
- io:put_chars(Fd, [$=]),
- io:put_chars(Fd, Msg),
- io:put_chars(Fd, "\n");
+output_to_fd(Fd, Msg=[$=|_], internal) ->
+ io:put_chars(Fd, [Msg,"\n"]);
output_to_fd(Fd, Msg, internal) ->
- io:put_chars(Fd, [$=,$=,$=,$ ]),
- io:put_chars(Fd, Msg),
- io:put_chars(Fd, "\n");
+ io:put_chars(Fd, [$=,$=,$=,$ , Msg, "\n"]);
output_to_fd(Fd, Msg, _Sender) ->
- io:put_chars(Fd, Msg),
case get(test_server_log_nl) of
- false -> ok;
- _ -> io:put_chars(Fd, "\n")
+ false -> io:put_chars(Fd, Msg);
+ _ -> io:put_chars(Fd, [Msg,"\n"])
end.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%