diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-04-05 16:47:27 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-05 16:47:27 +0200 |
| commit | 120a586a5d7d13e0d022dd773537856d30482e1e (patch) | |
| tree | 211ea0fcfc8daa620165248ab4cd1bb67f61832e /erts/test/z_SUITE.erl | |
| parent | 6b17c34656457bf0da708f5c719adabbbd0a00cf (diff) | |
| download | otp-120a586a5d7d13e0d022dd773537856d30482e1e.tar.gz otp-120a586a5d7d13e0d022dd773537856d30482e1e.tar.bz2 otp-120a586a5d7d13e0d022dd773537856d30482e1e.zip | |
Modernize use of timetraps
Diffstat (limited to 'erts/test/z_SUITE.erl')
| -rw-r--r-- | erts/test/z_SUITE.erl | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl index 7f3260e4cb..e6ce90ac3e 100644 --- a/erts/test/z_SUITE.erl +++ b/erts/test/z_SUITE.erl @@ -24,8 +24,6 @@ %% This suite expects to be run as the last suite of all suites. %% -%-define(line_trace, 1). - -include_lib("kernel/include/file.hrl"). -record(core_search_conf, {search_dir, @@ -34,47 +32,19 @@ file, run_by_ts}). --define(DEFAULT_TIMEOUT, ?t:minutes(5)). - --export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, - init_per_group/2,end_per_group/2, - init_per_testcase/2, end_per_testcase/2]). +-export([all/0, suite/0]). -export([search_for_core_files/1, core_files/1]). -include_lib("common_test/include/ct.hrl"). - -init_per_testcase(Case, Config) -> - Dog = ?t:timetrap(?DEFAULT_TIMEOUT), - [{testcase, Case}, {watchdog, Dog} |Config]. - -end_per_testcase(_Case, Config) -> - Dog = ?config(watchdog, Config), - ?t:timetrap_cancel(Dog), - ok. - -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap, {minutes, 5}}]. all() -> [core_files]. -groups() -> - []. - -init_per_suite(Config) -> - Config. - -end_per_suite(_Config) -> - ok. - -init_per_group(_GroupName, Config) -> - Config. - -end_per_group(_GroupName, Config) -> - Config. - - core_files(doc) -> []; |