diff options
author | Erlang/OTP <[email protected]> | 2016-05-03 10:10:54 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2016-05-03 10:10:54 +0200 |
commit | f8ff2711258e4b30f9a984dfc27fd66cffe26b5f (patch) | |
tree | 673411519fca4794cecee3fd97668f59eee4c114 /lib/common_test/src/ct_master.erl | |
parent | 8c01f80cb349b202ad71e12c40efafa7f83f617a (diff) | |
parent | b7ced331aa797567c4e180eec0b59e59f7227044 (diff) | |
download | otp-f8ff2711258e4b30f9a984dfc27fd66cffe26b5f.tar.gz otp-f8ff2711258e4b30f9a984dfc27fd66cffe26b5f.tar.bz2 otp-f8ff2711258e4b30f9a984dfc27fd66cffe26b5f.zip |
Merge branch 'peppe/ct_misc_18_patches' into maint-18
* peppe/ct_misc_18_patches:
Add flag/option for disabling the character escaping functionality
Fix bug using the wrong lists search function
Fix bug with clashing timestamp values
Fix problem with stylesheet tags getting escaped
Skip pre/post test IO suite if cover or debug is running
Tweak pre_post_io test case to run without failing
Fix various log related problems
Diffstat (limited to 'lib/common_test/src/ct_master.erl')
-rw-r--r-- | lib/common_test/src/ct_master.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl index 228daf459b..d24edad2eb 100644 --- a/lib/common_test/src/ct_master.erl +++ b/lib/common_test/src/ct_master.erl @@ -27,7 +27,7 @@ -export([run_on_node/2,run_on_node/3]). -export([run_test/1,run_test/2]). -export([get_event_mgr_ref/0]). --export([basic_html/1]). +-export([basic_html/1,esc_chars/1]). -export([abort/0,abort/1,progress/0]). @@ -317,6 +317,16 @@ basic_html(Bool) -> ok. %%%----------------------------------------------------------------- +%%% @spec esc_chars(Bool) -> ok +%%% Bool = true | false +%%% +%%% @doc If set to false, the ct_master logs will be written without +%%% special characters being escaped in the HTML logs. +esc_chars(Bool) -> + application:set_env(common_test_master, esc_chars, Bool), + ok. + +%%%----------------------------------------------------------------- %%% MASTER, runs on central controlling node. %%%----------------------------------------------------------------- start_master(NodeOptsList) -> |