diff options
| author | Peter Andersson <[email protected]> | 2014-04-03 10:13:16 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-04-03 10:13:16 +0200 |
| commit | 4f01844fc9feda7366c2995fa87bbbf862ea7e69 (patch) | |
| tree | 2815738f6198d3176e467f70c812bb268a187bff /lib/common_test/src/ct.erl | |
| parent | a6f1a39b615885c2ee4cef53c2deaa996aad3f78 (diff) | |
| parent | 3fab0d4b7c7fc39cc5b92dd7f19743780ccd20b5 (diff) | |
| download | otp-4f01844fc9feda7366c2995fa87bbbf862ea7e69.tar.gz otp-4f01844fc9feda7366c2995fa87bbbf862ea7e69.tar.bz2 otp-4f01844fc9feda7366c2995fa87bbbf862ea7e69.zip | |
Merge branch 'peppe/common_test/otp_17_doc'
* peppe/common_test/otp_17_doc:
Document the abort_if_missing_suites functionality
Document changes in the CT hooks API and the event message protocol
Document new ct_telnet logging features
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 e6732f7fc7..241cd928b7 100644 --- a/lib/common_test/src/ct.erl +++ b/lib/common_test/src/ct.erl @@ -150,7 +150,8 @@ run(TestDirs) -> %%% {silent_connections,Conns} | {stylesheet,CSSFile} | %%% {cover,CoverSpecFile} | {cover_stop,Bool} | {step,StepOpts} | %%% {event_handler,EventHandlers} | {include,InclDirs} | -%%% {auto_compile,Bool} | {create_priv_dir,CreatePrivDir} | +%%% {auto_compile,Bool} | {abort_if_missing_suites,Bool} | +%%% {create_priv_dir,CreatePrivDir} | %%% {multiply_timetraps,M} | {scale_timetraps,Bool} | %%% {repeat,N} | {duration,DurTime} | {until,StopTime} | %%% {force_stop,ForceStop} | {decrypt,DecryptKeyOrFile} | |