From c062dfc485ad0d51d648701950f77ef8f51d4f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 8 Mar 2016 19:35:31 +0100
Subject: Modernize use of timetraps

---
 erts/emulator/test/nested_SUITE.erl | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'erts/emulator/test/nested_SUITE.erl')

diff --git a/erts/emulator/test/nested_SUITE.erl b/erts/emulator/test/nested_SUITE.erl
index ee6bbf6a55..5b59a9f3d7 100644
--- a/erts/emulator/test/nested_SUITE.erl
+++ b/erts/emulator/test/nested_SUITE.erl
@@ -20,33 +20,19 @@
 
 -module(nested_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
+-export([all/0, suite/0,
 	 case_in_case/1, case_in_after/1, catch_in_catch/1, bif_in_bif/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
     [case_in_case, case_in_after, catch_in_catch,
      bif_in_bif].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 case_in_case(suite) -> [];
 case_in_case(Config) when is_list(Config) ->
-- 
cgit v1.2.3