aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-05-03 10:10:54 +0200
committerErlang/OTP <[email protected]>2016-05-03 10:10:54 +0200
commitf8ff2711258e4b30f9a984dfc27fd66cffe26b5f (patch)
tree673411519fca4794cecee3fd97668f59eee4c114 /lib/common_test/src/ct.erl
parent8c01f80cb349b202ad71e12c40efafa7f83f617a (diff)
parentb7ced331aa797567c4e180eec0b59e59f7227044 (diff)
downloadotp-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.erl')
-rw-r--r--lib/common_test/src/ct.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 538be514d6..22941668f2 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -161,9 +161,9 @@ run(TestDirs) ->
%%% {repeat,N} | {duration,DurTime} | {until,StopTime} |
%%% {force_stop,ForceStop} | {decrypt,DecryptKeyOrFile} |
%%% {refresh_logs,LogDir} | {logopts,LogOpts} |
-%%% {verbosity,VLevels} | {basic_html,Bool} |
-%%% {ct_hooks, CTHs} | {enable_builtin_hooks,Bool} |
-%%% {release_shell,Bool}
+%%% {verbosity,VLevels} | {basic_html,Bool} |
+%%% {esc_chars,Bool} | {ct_hooks, CTHs} |
+%%% {enable_builtin_hooks,Bool} | {release_shell,Bool}
%%% TestDirs = [string()] | string()
%%% Suites = [string()] | [atom()] | string() | atom()
%%% Cases = [atom()] | atom()