diff options
| author | Peter Andersson <[email protected]> | 2013-09-02 11:21:43 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-09-02 11:22:05 +0200 |
| commit | fa1e0c642845cf7e72f0eef0af70baf5b87a0e3c (patch) | |
| tree | a2d06bc6a9aa1e9b419cc3de59ed231089961fa6 /lib/common_test/src | |
| parent | 89d00503ba848cbf71546b7bdee9dfb73573af67 (diff) | |
| parent | 91ba609f042834613d21f34df95eca2f78632e94 (diff) | |
| download | otp-fa1e0c642845cf7e72f0eef0af70baf5b87a0e3c.tar.gz otp-fa1e0c642845cf7e72f0eef0af70baf5b87a0e3c.tar.bz2 otp-fa1e0c642845cf7e72f0eef0af70baf5b87a0e3c.zip | |
Merge remote branch 'origin/peppe/common_test/cth_log_error' into maint
* origin/peppe/common_test/cth_log_error:
Fix error in builtin hook calling non-existing function
OTP-11238
Diffstat (limited to 'lib/common_test/src')
| -rw-r--r-- | lib/common_test/src/cth_log_redirect.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl index 958b7a94c7..83fc879967 100644 --- a/lib/common_test/src/cth_log_redirect.erl +++ b/lib/common_test/src/cth_log_redirect.erl @@ -46,7 +46,7 @@ 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}}; + {Result, {set_log_func(tc_log),Group}}; false -> {Result, tc_log_async} end; @@ -59,7 +59,7 @@ post_end_per_testcase(_TC, _Config, Result, State) -> gen_event:call(error_logger, ?MODULE, flush, 300000), {Result, State}. -pre_end_per_group(Group, Config, {ct_log, Group}) -> +pre_end_per_group(Group, Config, {tc_log, Group}) -> {Config, set_log_func(tc_log_async)}; pre_end_per_group(_Group, Config, State) -> {Config, State}. |