diff options
| author | Björn Gustavsson <[email protected]> | 2016-02-26 06:47:38 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-04-18 08:10:36 +0200 |
| commit | 87c18e235cbcce8edc19d3bb154bf0cfa51a7c62 (patch) | |
| tree | 2e9641facc0c409e74e14648c40c3d482f2110a3 /lib/debugger/test/erl_eval_SUITE.erl | |
| parent | 6c9822baad0ad7e0c535a023b45cee24619b301e (diff) | |
| download | otp-87c18e235cbcce8edc19d3bb154bf0cfa51a7c62.tar.gz otp-87c18e235cbcce8edc19d3bb154bf0cfa51a7c62.tar.bz2 otp-87c18e235cbcce8edc19d3bb154bf0cfa51a7c62.zip | |
Modernize use of timetraps
Either rely on the default 30 minutes timetrap, or set the timeout
using the supported methods in common_test.
Diffstat (limited to 'lib/debugger/test/erl_eval_SUITE.erl')
| -rw-r--r-- | lib/debugger/test/erl_eval_SUITE.erl | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/lib/debugger/test/erl_eval_SUITE.erl b/lib/debugger/test/erl_eval_SUITE.erl index ab1a465085..e1f35cfa4e 100644 --- a/lib/debugger/test/erl_eval_SUITE.erl +++ b/lib/debugger/test/erl_eval_SUITE.erl @@ -19,6 +19,7 @@ -module(erl_eval_SUITE). -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, + init_per_testcase/2, end_per_testcase/2, init_per_group/2,end_per_group/2]). -export([guard_1/1, guard_2/1, @@ -43,38 +44,23 @@ eval_expr_5/1, eep37/1]). -%% -%% Define to run outside of test server -%% -%%-define(STANDALONE,1). +-include_lib("common_test/include/ct.hrl"). -import(lists,[concat/1, sort/1]). -export([count_down/2, count_down_fun/0, do_apply/2, local_func/3, local_func_value/2]). --ifdef(STANDALONE). --define(config(A,B),config(A,B)). --export([config/2]). --define(line, noop, ). -config(priv_dir,_) -> - ".". --else. --include_lib("common_test/include/ct.hrl"). --export([init_per_testcase/2, end_per_testcase/2]). -% Default timetrap timeout (set in init_per_testcase). --define(default_timeout, ?t:minutes(1)). init_per_testcase(_Case, Config) -> test_lib:interpret(?MODULE), - ?line Dog = ?t:timetrap(?default_timeout), - [{watchdog, Dog} | Config]. -end_per_testcase(_Case, Config) -> - Dog = ?config(watchdog, Config), - test_server:timetrap_cancel(Dog), + Config. + +end_per_testcase(_Case, _Config) -> ok. --endif. -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. all() -> [guard_1, guard_2, match_pattern, string_plusplus, |