aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server_io.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-11-08 14:49:36 +0100
committerBjörn Gustavsson <[email protected]>2012-11-08 14:49:36 +0100
commita1ba0ade00a08968d289912c8a8b709417ba80c5 (patch)
treec41db49405fe6b9d905abbe059d4ecf286d0072d /lib/test_server/src/test_server_io.erl
parent27cadfdfb196d29cc237a7938fe97671d40264a6 (diff)
parentf816de97c1fdbb96ca09a8980dab32ad2e1785e7 (diff)
downloadotp-a1ba0ade00a08968d289912c8a8b709417ba80c5.tar.gz
otp-a1ba0ade00a08968d289912c8a8b709417ba80c5.tar.bz2
otp-a1ba0ade00a08968d289912c8a8b709417ba80c5.zip
Merge branch 'bjorn/ct/minor-corrections'
* bjorn/ct/minor-corrections: test_server_io: Correct a few comments Handle ct:abort_current_testcase/1 when executing parallel groups Make sure that "Cover analysing..." is written to stdout Make sure that "Testing..." is not written if testing has finished
Diffstat (limited to 'lib/test_server/src/test_server_io.erl')
-rw-r--r--lib/test_server/src/test_server_io.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/test_server/src/test_server_io.erl b/lib/test_server/src/test_server_io.erl
index abdfb71241..e960b3087a 100644
--- a/lib/test_server/src/test_server_io.erl
+++ b/lib/test_server/src/test_server_io.erl
@@ -68,8 +68,8 @@ stop() ->
%% Return a group leader (a process using the test_server_gl module).
%% If Shared is true, the shared group leader is returned (suitable for
%% running sequential test cases), otherwise a new group leader process
-%% is spawned. Group leader processes will live until they are garbaged
-%% collected by a call to gc/0.
+%% is spawned. Group leader processes will live until the
+%% 'test_server_io' process is stopped.
get_gl(Shared) when is_boolean(Shared) ->
req({get_gl,Shared}).
@@ -95,7 +95,7 @@ start_transaction() ->
%% end_transaction()
%%
%% End the transaction started by start_transaction/0. Subsequent calls to
-%% print/3 will cause the message to be printed directory.
+%% print/3 will cause the message to be printed directly.
end_transaction() ->
req({end_transaction,self()}).
@@ -253,6 +253,8 @@ output(From, Tag, Str, #st{io_buffering=Buffered,buffered=Buf0}=St) ->
St#st{buffered=Buf}
end.
+do_output(stdout, Str, #st{job_name=undefined}) ->
+ io:put_chars(Str);
do_output(stdout, Str0, #st{job_name=Name}) ->
Str = io_lib:format("Testing ~s: ~s\n", [Name,Str0]),
io:put_chars(Str);