diff options
author | Peter Andersson <[email protected]> | 2016-03-10 13:01:35 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2016-03-10 13:01:35 +0100 |
commit | e1f935eedd9cfb8572c43f9d180b913fbf6af7b6 (patch) | |
tree | a98dcb647cc4f928c1984dc5ba3e9e2dd2a7cdac /lib/common_test/src/ct_logs.erl | |
parent | 64619e6b2a5ddf9fa4d1c06a61b551c34a2b065c (diff) | |
parent | 52cee865fd9e5b4a1371c82075375a92b8f03fbe (diff) | |
download | otp-e1f935eedd9cfb8572c43f9d180b913fbf6af7b6.tar.gz otp-e1f935eedd9cfb8572c43f9d180b913fbf6af7b6.tar.bz2 otp-e1f935eedd9cfb8572c43f9d180b913fbf6af7b6.zip |
Merge branch 'peppe/common_test/misc_18.3_bugfixes' into maint
* peppe/common_test/misc_18.3_bugfixes:
Fix minor issues with escaping characters
OTP-13003
Diffstat (limited to 'lib/common_test/src/ct_logs.erl')
-rw-r--r-- | lib/common_test/src/ct_logs.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index e3f995ad3f..4920383f39 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -432,10 +432,16 @@ tc_log(Category,Importance,Format,Args,Opts) -> %%% stuff directly from a testcase (i.e. not from within the CT %%% framework).</p> tc_log(Category,Importance,Printer,Format,Args,Opts) -> - cast({log,sync,self(),group_leader(),Category,Importance, - [{hd,div_header(Category,Printer),[]}, - {Format,Args}, - {ft,div_footer(),[]}], + Data = + case lists:member(no_css, Opts) of + true -> + [{Format,Args}]; + false -> + [{hd,div_header(Category,Printer),[]}, + {Format,Args}, + {ft,div_footer(),[]}] + end, + cast({log,sync,self(),group_leader(),Category,Importance,Data, lists:member(esc_chars, Opts)}), ok. |