diff options
author | Siri Hansen <[email protected]> | 2013-04-04 15:38:55 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2013-04-04 15:38:55 +0200 |
commit | c3b26ff8c9d79ebee20fe33b0d8954e5cc68a29f (patch) | |
tree | 15b81b5750bf8e5806c15386d1a2ffe11d4a1df0 /lib/common_test/src/ct.erl | |
parent | e72043e3519cb14aabf461849eba959b97e07410 (diff) | |
parent | 789f7e808a56c216728ee6843434691fd22f9581 (diff) | |
download | otp-c3b26ff8c9d79ebee20fe33b0d8954e5cc68a29f.tar.gz otp-c3b26ff8c9d79ebee20fe33b0d8954e5cc68a29f.tar.bz2 otp-c3b26ff8c9d79ebee20fe33b0d8954e5cc68a29f.zip |
Merge branch 'siri/common_test/force_stop-skip_rest/OTP-10856' into maint
* siri/common_test/force_stop-skip_rest/OTP-10856:
[common_test] Document '-force_stop skip_rest' option to ct_run
[common_test] Add tests for repeated testruns
[common_test] Add support for testing repeated testruns
[common_test] Add -force_stop skip_rest option when repeating tests
Diffstat (limited to 'lib/common_test/src/ct.erl')
-rw-r--r-- | lib/common_test/src/ct.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl index 04a95a53fa..e6732f7fc7 100644 --- a/lib/common_test/src/ct.erl +++ b/lib/common_test/src/ct.erl @@ -153,7 +153,7 @@ run(TestDirs) -> %%% {auto_compile,Bool} | {create_priv_dir,CreatePrivDir} | %%% {multiply_timetraps,M} | {scale_timetraps,Bool} | %%% {repeat,N} | {duration,DurTime} | {until,StopTime} | -%%% {force_stop,Bool} | {decrypt,DecryptKeyOrFile} | +%%% {force_stop,ForceStop} | {decrypt,DecryptKeyOrFile} | %%% {refresh_logs,LogDir} | {logopts,LogOpts} | %%% {verbosity,VLevels} | {basic_html,Bool} | %%% {ct_hooks, CTHs} | {enable_builtin_hooks,Bool} | @@ -184,6 +184,7 @@ run(TestDirs) -> %%% N = integer() %%% DurTime = string(HHMMSS) %%% StopTime = string(YYMoMoDDHHMMSS) | string(HHMMSS) +%%% ForceStop = skip_rest | Bool %%% DecryptKeyOrFile = {key,DecryptKey} | {file,DecryptFile} %%% DecryptKey = string() %%% DecryptFile = string() |