diff options
| author | Peter Andersson <[email protected]> | 2013-01-27 02:17:16 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-01-27 02:20:36 +0100 |
| commit | 57abbf21ff6ce0a97182f848177338c1e2bceab2 (patch) | |
| tree | 00ed4b96a171a3a080077610a4ca5eabe74bd6c5 /lib/common_test/doc/src/ct_run.xml | |
| parent | 936e5d23bc65a5ee8f2119dd1940b7edf20aca6c (diff) | |
| parent | c88b50bdf301b5ce17ce8f4f0d50d838e94292c6 (diff) | |
| download | otp-57abbf21ff6ce0a97182f848177338c1e2bceab2.tar.gz otp-57abbf21ff6ce0a97182f848177338c1e2bceab2.tar.bz2 otp-57abbf21ff6ce0a97182f848177338c1e2bceab2.zip | |
Merge branch 'peppe/common_test/testspec_include'
* peppe/common_test/testspec_include:
Add more tests
Update documentation
Add tests and correct errors
Update CT Master
Implement support for including test specifications
Make it possible to execute one test run per test specification
Conflicts:
lib/common_test/src/ct_master.erl
lib/common_test/src/ct_run.erl
lib/common_test/src/ct_testspec.erl
OTP-9881
Diffstat (limited to 'lib/common_test/doc/src/ct_run.xml')
| -rw-r--r-- | lib/common_test/doc/src/ct_run.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml index 0750f560b3..198290c1be 100644 --- a/lib/common_test/doc/src/ct_run.xml +++ b/lib/common_test/doc/src/ct_run.xml @@ -126,6 +126,7 @@ <title>Run tests using test specification</title> <pre> ct_run -spec TestSpec1 TestSpec2 .. TestSpecN + [-join_specs] [-config ConfigFile1 ConfigFile2 .. ConfigFileN] [-userconfig CallbackModule1 ConfigString1 and CallbackModule2 ConfigString2 and .. and CallbackModuleN ConfigStringN] |