diff options
| author | Micael Karlberg <[email protected]> | 2011-10-06 11:03:09 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-10-06 11:03:09 +0200 |
| commit | d6c066068b827cfa9503966cab23366227b1f48a (patch) | |
| tree | 29b37fa1e185419fc19ffe91a06436c87af47b2b /lib/common_test/src/ct.erl | |
| parent | 87ca1d9f9d0962609ccb17a1b306a8a0815bc6c5 (diff) | |
| parent | d01551f400e2a7944dcc10319be0c9f248ca3179 (diff) | |
| download | otp-d6c066068b827cfa9503966cab23366227b1f48a.tar.gz otp-d6c066068b827cfa9503966cab23366227b1f48a.tar.bz2 otp-d6c066068b827cfa9503966cab23366227b1f48a.zip | |
Merge branch 'master' of super:otp into bmk/megaco/20111003/improving_mstone1/OTP-9604
Diffstat (limited to 'lib/common_test/src/ct.erl')
| -rw-r--r-- | lib/common_test/src/ct.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl index 3a96190256..69e15fa246 100644 --- a/lib/common_test/src/ct.erl +++ b/lib/common_test/src/ct.erl @@ -148,10 +148,10 @@ run(TestDirs) -> %%% {auto_compile,Bool} | {multiply_timetraps,M} | {scale_timetraps,Bool} | %%% {repeat,N} | {duration,DurTime} | {until,StopTime} | %%% {force_stop,Bool} | {decrypt,DecryptKeyOrFile} | -%%% {refresh_logs,LogDir} | {basic_html,Bool} | +%%% {refresh_logs,LogDir} | {logopts,LogOpts} | {basic_html,Bool} | %%% {ct_hooks, CTHs} | {enable_builtin_hooks,Bool} %%% TestDirs = [string()] | string() -%%% Suites = [string()] | string() +%%% Suites = [string()] | [atom()] | string() | atom() %%% Cases = [atom()] | atom() %%% Groups = [atom()] | atom() %%% TestSpecs = [string()] | string() @@ -177,6 +177,8 @@ run(TestDirs) -> %%% DecryptKeyOrFile = {key,DecryptKey} | {file,DecryptFile} %%% DecryptKey = string() %%% DecryptFile = string() +%%% LogOpts = [LogOpt] +%%% LogOpt = no_nl | no_src %%% CTHs = [CTHModule | {CTHModule, CTHInitArgs}] %%% CTHModule = atom() %%% CTHInitArgs = term() |