diff options
| author | Henrik Nord <[email protected]> | 2016-05-04 12:54:05 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2016-05-04 12:54:05 +0200 |
| commit | 91d372e23e1d19bb0c5200ba1682f9e4bc57ed76 (patch) | |
| tree | 79eedbd59410d013190e63373b1e7c25d6a7862c /lib/common_test/src/ct_master.erl | |
| parent | 4c8fdca47c9e727dfcc1ab2049ffea35cef76b39 (diff) | |
| parent | 1ab69efa960703b86a13ea6ba96f4fd56f1565f9 (diff) | |
| download | otp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.tar.gz otp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.tar.bz2 otp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.zip | |
Merge branch 'maint-18'
Conflicts:
OTP_VERSION
lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
lib/common_test/vsn.mk
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 32c8ab96ec..c4905b316f 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) -> |