aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-03-26 13:36:39 +0200
committerPeter Andersson <[email protected]>2012-03-26 13:36:39 +0200
commit2e39538b3ef1b27abd8053b22af890fa3999d7b6 (patch)
tree769d160a630f247442b54045bb8079994adcef59 /lib
parentd99a08538c4445dc34da0ca6246afb84123d295f (diff)
parentc75d6ef4e32affebd6e5a3a03bbbb18532940030 (diff)
downloadotp-2e39538b3ef1b27abd8053b22af890fa3999d7b6.tar.gz
otp-2e39538b3ef1b27abd8053b22af890fa3999d7b6.tar.bz2
otp-2e39538b3ef1b27abd8053b22af890fa3999d7b6.zip
Merge remote branch 'origin/peppe/common_test/otp-10011' into maint
* origin/peppe/common_test/otp-10011: Document the create_priv_dir option for ct:run_test/1
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 63a8adbc63..68ddce8068 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -146,7 +146,8 @@ run(TestDirs) ->
%%% {silent_connections,Conns} | {stylesheet,CSSFile} |
%%% {cover,CoverSpecFile} | {step,StepOpts} |
%%% {event_handler,EventHandlers} | {include,InclDirs} |
-%%% {auto_compile,Bool} | {multiply_timetraps,M} | {scale_timetraps,Bool} |
+%%% {auto_compile,Bool} | {create_priv_dir,CreatePrivDir} |
+%%% {multiply_timetraps,M} | {scale_timetraps,Bool} |
%%% {repeat,N} | {duration,DurTime} | {until,StopTime} |
%%% {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
%%% {refresh_logs,LogDir} | {logopts,LogOpts} | {basic_html,Bool} |
@@ -171,6 +172,7 @@ run(TestDirs) ->
%%% EH = atom() | {atom(),InitArgs} | {[atom()],InitArgs}
%%% InitArgs = [term()]
%%% InclDirs = [string()] | string()
+%%% CreatePrivDir = auto_per_run | auto_per_tc | manual_per_tc
%%% M = integer()
%%% N = integer()
%%% DurTime = string(HHMMSS)