diff options
| author | Lukas <[email protected]> | 2011-09-26 12:28:09 +0200 |
|---|---|---|
| committer | Lukas <[email protected]> | 2011-09-26 12:28:09 +0200 |
| commit | 1eb09dda09fa3de6b05f09d881065a0a7de2624f (patch) | |
| tree | 66f2a313b5ed62036744b72b03c108eafcdc1372 /lib/common_test/src/ct_testspec.erl | |
| parent | a5baff1ab34518a5282da7ec9a32ac8ec991d4b4 (diff) | |
| parent | 516cbd4312c6fc8ca082d763b9a295acbc7e395c (diff) | |
| download | otp-1eb09dda09fa3de6b05f09d881065a0a7de2624f.tar.gz otp-1eb09dda09fa3de6b05f09d881065a0a7de2624f.tar.bz2 otp-1eb09dda09fa3de6b05f09d881065a0a7de2624f.zip | |
Merge branch 'dev' into major
* dev:
Add documentation for cth_log_redirect and built-in hooks
Correct wrong match from lists:keyfind
Update cth_log_redirect to wait for all error_logger events before ending test
Force logging to framework log for parallel tests
Add ct_log:ct_log funcion
Add a hook for redirecting SASL and error_logger messages
Add -enable_builtin_hooks <bool> config option
Export write_events and add option to return a string
Diffstat (limited to 'lib/common_test/src/ct_testspec.erl')
| -rw-r--r-- | lib/common_test/src/ct_testspec.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl index d845358bb2..96971ccfc7 100644 --- a/lib/common_test/src/ct_testspec.erl +++ b/lib/common_test/src/ct_testspec.erl @@ -646,6 +646,10 @@ add_tests([{ct_hooks, _Node, []}|Ts], Spec) -> add_tests([{ct_hooks, Hooks}|Ts], Spec) -> add_tests([{ct_hooks, all_nodes, Hooks}|Ts], Spec); +%% -- enable_builtin_hooks -- +add_tests([{enable_builtin_hooks,Bool}|Ts],Spec) -> + add_tests(Ts, Spec#testspec{ enable_builtin_hooks = Bool }); + %% --- include --- add_tests([{include,all_nodes,InclDirs}|Ts],Spec) -> Tests = lists:map(fun(N) -> {include,N,InclDirs} end, list_nodes(Spec)), @@ -1104,6 +1108,7 @@ valid_terms() -> {event_handler,4}, {ct_hooks,2}, {ct_hooks,3}, + {enable_builtin_hooks,1}, {multiply_timetraps,2}, {multiply_timetraps,3}, {scale_timetraps,2}, |