diff options
| author | Erlang/OTP <[email protected]> | 2016-05-03 10:10:54 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-05-03 10:10:54 +0200 |
| commit | f8ff2711258e4b30f9a984dfc27fd66cffe26b5f (patch) | |
| tree | 673411519fca4794cecee3fd97668f59eee4c114 /lib/common_test/src/ct_hooks.erl | |
| parent | 8c01f80cb349b202ad71e12c40efafa7f83f617a (diff) | |
| parent | b7ced331aa797567c4e180eec0b59e59f7227044 (diff) | |
| download | otp-f8ff2711258e4b30f9a984dfc27fd66cffe26b5f.tar.gz otp-f8ff2711258e4b30f9a984dfc27fd66cffe26b5f.tar.bz2 otp-f8ff2711258e4b30f9a984dfc27fd66cffe26b5f.zip | |
Merge branch 'peppe/ct_misc_18_patches' into maint-18
* peppe/ct_misc_18_patches:
Add flag/option for disabling the character escaping functionality
Fix bug using the wrong lists search function
Fix bug with clashing timestamp values
Fix problem with stylesheet tags getting escaped
Skip pre/post test IO suite if cover or debug is running
Tweak pre_post_io test case to run without failing
Fix various log related problems
Diffstat (limited to 'lib/common_test/src/ct_hooks.erl')
| -rw-r--r-- | lib/common_test/src/ct_hooks.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl index 83ad33fdd8..90f36cbdc2 100644 --- a/lib/common_test/src/ct_hooks.erl +++ b/lib/common_test/src/ct_hooks.erl @@ -67,6 +67,8 @@ terminate(Hooks) -> %% tests. -spec init_tc(Mod :: atom(), FuncSpec :: atom() | + {ConfigFunc :: init_per_testcase | end_per_testcase, + TestCase :: atom()} | {ConfigFunc :: init_per_group | end_per_group, GroupName :: atom(), Properties :: list()}, @@ -103,7 +105,9 @@ init_tc(_Mod, TC = error_in_suite, Config) -> %% @doc Called as each test case is completed. This includes all configuration %% tests. -spec end_tc(Mod :: atom(), - FuncSpec :: atom() | + FuncSpec :: atom() | + {ConfigFunc :: init_per_testcase | end_per_testcase, + TestCase :: atom()} | {ConfigFunc :: init_per_group | end_per_group, GroupName :: atom(), Properties :: list()}, |