aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test/otp_SUITE.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-05 16:47:27 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-05 16:47:27 +0200
commit120a586a5d7d13e0d022dd773537856d30482e1e (patch)
tree211ea0fcfc8daa620165248ab4cd1bb67f61832e /erts/test/otp_SUITE.erl
parent6b17c34656457bf0da708f5c719adabbbd0a00cf (diff)
downloadotp-120a586a5d7d13e0d022dd773537856d30482e1e.tar.gz
otp-120a586a5d7d13e0d022dd773537856d30482e1e.tar.bz2
otp-120a586a5d7d13e0d022dd773537856d30482e1e.zip
Modernize use of timetraps
Diffstat (limited to 'erts/test/otp_SUITE.erl')
-rw-r--r--erts/test/otp_SUITE.erl19
1 files changed, 4 insertions, 15 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 11f70e8465..17beecb77d 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -20,7 +20,7 @@
-module(otp_SUITE).
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,
init_per_suite/1,end_per_suite/1]).
-export([undefined_functions/1,deprecated_not_in_obsolete/1,
obsolete_but_not_deprecated/1,call_to_deprecated/1,
@@ -31,7 +31,9 @@
-import(lists, [filter/2,foldl/3,foreach/2]).
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+ [{ct_hooks,[ts_install_cth]},
+ {timetrap, {minutes, 10}}].
all() ->
[undefined_functions, deprecated_not_in_obsolete,
@@ -40,18 +42,7 @@ all() ->
erl_file_encoding, xml_file_encoding,
runtime_dependencies].
-groups() ->
- [].
-
-init_per_group(_GroupName, Config) ->
- Config.
-
-end_per_group(_GroupName, Config) ->
- Config.
-
-
init_per_suite(Config) ->
- Dog = test_server:timetrap(?t:minutes(10)),
Root = code:root_dir(),
Server = daily_xref,
xref:start(Server),
@@ -69,8 +60,6 @@ init_per_suite(Config) ->
_ ->
ok
end,
-
- ?t:timetrap_cancel(Dog),
[{xref_server,Server}|Config].
end_per_suite(Config) ->