diff options
| author | Peter Andersson <[email protected]> | 2012-03-06 10:06:29 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-06 10:07:06 +0100 |
| commit | 1a3f30697f8789ef4942058873a70c5b2bf4398a (patch) | |
| tree | fa43545c899d1cf5a21a8121a1776aba5f5c9b2a /lib/common_test/src/cth_log_redirect.erl | |
| parent | 98c6caf40154496207329992241c282a039c47f3 (diff) | |
| parent | a1a72e0378b38d6af412fe889b586a11aeab7fee (diff) | |
| download | otp-1a3f30697f8789ef4942058873a70c5b2bf4398a.tar.gz otp-1a3f30697f8789ef4942058873a70c5b2bf4398a.tar.bz2 otp-1a3f30697f8789ef4942058873a70c5b2bf4398a.zip | |
Merge remote branch 'origin/peppe/common_test/otp-9894' into maint
* origin/peppe/common_test/otp-9894:
Fix problem with large fun environment being copied unnecessarily
Implement asynchronous call to print to test case log file
OTP-9894
Diffstat (limited to 'lib/common_test/src/cth_log_redirect.erl')
| -rw-r--r-- | lib/common_test/src/cth_log_redirect.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl index 14663b7738..e43ff875b3 100644 --- a/lib/common_test/src/cth_log_redirect.erl +++ b/lib/common_test/src/cth_log_redirect.erl @@ -38,15 +38,15 @@ id(_Opts) -> init(?MODULE, _Opts) -> error_logger:add_report_handler(?MODULE), - tc_log. + tc_log_async. -post_init_per_group(Group, Config, Result, tc_log) -> +post_init_per_group(Group, Config, Result, tc_log_async) -> case lists:member(parallel,proplists:get_value( tc_group_properties,Config,[])) of true -> {Result, {set_log_func(ct_log),Group}}; false -> - {Result, tc_log} + {Result, tc_log_async} end; post_init_per_group(_Group, _Config, Result, State) -> {Result, State}. @@ -58,14 +58,14 @@ post_end_per_testcase(_TC, _Config, Result, State) -> {Result, State}. pre_end_per_group(Group, Config, {ct_log, Group}) -> - {Config, set_log_func(tc_log)}; + {Config, set_log_func(tc_log_async)}; pre_end_per_group(_Group, Config, State) -> {Config, State}. %% Copied and modified from sasl_report_tty_h.erl init(_Type) -> - {ok, tc_log}. + {ok, tc_log_async}. handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() -> {ok, State}; |