diff options
| author | Siri Hansen <[email protected]> | 2013-04-04 15:43:06 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-04-04 15:43:06 +0200 |
| commit | a0fb34b3e6a73178e9b4c41ab2a20b3ba1762cd5 (patch) | |
| tree | 2ece9b6846f9b0e33b8c9ca22ec666066e20da9e /lib/common_test/src/ct.erl | |
| parent | 44a2884a7df320596039b8c8563bf73f9eb5aa6b (diff) | |
| parent | b74b21ba20e1e5aab7887891bf6672abb33f71fc (diff) | |
| download | otp-a0fb34b3e6a73178e9b4c41ab2a20b3ba1762cd5.tar.gz otp-a0fb34b3e6a73178e9b4c41ab2a20b3ba1762cd5.tar.bz2 otp-a0fb34b3e6a73178e9b4c41ab2a20b3ba1762cd5.zip | |
Merge branch 'maint'
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() |