aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-26 18:04:52 +0200
committerMicael Karlberg <[email protected]>2011-09-26 18:04:52 +0200
commitadacb706e77b90a9284c3f4d8c828992c9acebf8 (patch)
treeb801a4e1f5927642d5379e6be09ddf837ca8672b /lib/common_test/src/ct.erl
parent3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f (diff)
parent1eb09dda09fa3de6b05f09d881065a0a7de2624f (diff)
downloadotp-adacb706e77b90a9284c3f4d8c828992c9acebf8.tar.gz
otp-adacb706e77b90a9284c3f4d8c828992c9acebf8.tar.bz2
otp-adacb706e77b90a9284c3f4d8c828992c9acebf8.zip
Merge branch 'major' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'lib/common_test/src/ct.erl')
-rw-r--r--lib/common_test/src/ct.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 66da3ef742..3a96190256 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -149,7 +149,7 @@ run(TestDirs) ->
%%% {repeat,N} | {duration,DurTime} | {until,StopTime} |
%%% {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
%%% {refresh_logs,LogDir} | {basic_html,Bool} |
-%%% {ct_hooks, CTHs}
+%%% {ct_hooks, CTHs} | {enable_builtin_hooks,Bool}
%%% TestDirs = [string()] | string()
%%% Suites = [string()] | string()
%%% Cases = [atom()] | atom()