diff options
| author | Siri Hansen <[email protected]> | 2013-03-25 14:43:06 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-03-25 14:43:06 +0100 |
| commit | 19ee613287ae423a09daf448e3b9bde96e1c710b (patch) | |
| tree | 5ffe33b319f9c2a4851096fbc9ee3937fce06cb4 /lib/common_test/src/ct_run.erl | |
| parent | da0355042254d98a06acddbf7361bd0f0f4b4f7f (diff) | |
| download | otp-19ee613287ae423a09daf448e3b9bde96e1c710b.tar.gz otp-19ee613287ae423a09daf448e3b9bde96e1c710b.tar.bz2 otp-19ee613287ae423a09daf448e3b9bde96e1c710b.zip | |
[common_test] Add -force_stop skip_rest option when repeating tests
To allow a repeated test to finish immediatly, 'skip_rest' option can
now be used in combination with 'force_stop'. If this option is used,
only the current testcase will be completed after timeout is reached
when repeating with 'duration' or 'until'.
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 49f00429ae..57cfab532e 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -771,9 +771,9 @@ script_usage() -> "\n\t[-scale_timetraps]" "\n\t[-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]" "\n\t[-basic_html]" - "\n\t[-repeat N [-force_stop]] |" - "\n\t[-duration HHMMSS [-force_stop]] |" - "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop]]\n\n"), + "\n\t[-repeat N] |" + "\n\t[-duration HHMMSS [-force_stop [skip_rest]]] |" + "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]\n\n"), io:format("Run tests using test specification:\n\n" "\tct_run -spec TestSpec1 TestSpec2 .. TestSpecN" "\n\t[-config ConfigFile1 ConfigFile2 .. ConfigFileN]" @@ -795,9 +795,9 @@ script_usage() -> "\n\t[-scale_timetraps]" "\n\t[-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]" "\n\t[-basic_html]" - "\n\t[-repeat N [-force_stop]] |" - "\n\t[-duration HHMMSS [-force_stop]] |" - "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop]]\n\n"), + "\n\t[-repeat N] |" + "\n\t[-duration HHMMSS [-force_stop [skip_rest]]] |" + "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]\n\n"), io:format("Refresh the HTML index files:\n\n" "\tct_run -refresh_logs [LogDir]" "[-logdir LogDir] " @@ -2933,6 +2933,8 @@ opts2args(EnvStartOpts) -> []; ({create_priv_dir,PD}) when is_atom(PD) -> [{create_priv_dir,[atom_to_list(PD)]}]; + ({force_stop,skip_rest}) -> + [{force_stop,["skip_rest"]}]; ({force_stop,true}) -> [{force_stop,[]}]; ({force_stop,false}) -> |