Modernize use of timetraps

8 files changed, 69 insertions, 243 deletions

diff --git a/erts/test/erl_print_SUITE.erl b/erts/test/erl_print_SUITE.erl
index ceec4f4259..5699a906aa 100644
--- a/erts/test/erl_print_SUITE.erl
+++ b/erts/test/erl_print_SUITE.erl
@@ -28,51 +28,33 @@
 -module(erl_print_SUITE).
 -author('[email protected]').
 
-
-%-define(line_trace, 1).
-
--define(DEFAULT_TIMEOUT, ?t:minutes(10)).
-
--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, init_per_testcase/2, end_per_testcase/2]).
 
 -export([erlang_display/1, integer/1, float/1,
          string/1, character/1, snprintf/1, quote/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 10}}].
 
 all() -> 
-    test_cases().
-
-groups() -> 
-    [].
+    [erlang_display, integer, float, string, character,
+     snprintf, quote].
 
-init_per_suite(Config) ->
-    Config.
+init_per_testcase(Case, Config) ->
+    [{testcase, Case}|Config].
 
-end_per_suite(_Config) ->
+end_per_testcase(_Case, _Config) ->
     ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %%
 %%
 %% Test cases
 %%
 %%
 
-test_cases() -> 
-    [erlang_display, integer, float, string, character,
-     snprintf, quote].
-
 erlang_display(doc) -> [];
 erlang_display(suite) -> [];
 erlang_display(Config) when is_list(Config) ->
@@ -244,15 +226,6 @@ default_testcase_impl(doc) -> [];
 default_testcase_impl(suite) -> [];
 default_testcase_impl(Config) when is_list(Config) -> run_case(Config).
 
-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.
-
 -define(TESTPROG, "erl_print_tests").
 -define(FAILED_MARKER, $E,$P,$-,$T,$E,$S,$T,$-,$F,$A,$I,$L,$U,$R,$E).
 -define(SKIPPED_MARKER, $E,$P,$-,$T,$E,$S,$T,$-,$S,$K,$I,$P).
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index 91fb79bc80..d90daf78c3 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -27,54 +27,32 @@
 %%%-------------------------------------------------------------------
 -module(erlexec_SUITE).
 
+-export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
 
-%-define(line_trace, 1).
-
--define(DEFAULT_TIMEOUT, ?t:minutes(1)).
-
--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([args_file/1, evil_args_file/1, env/1, args_file_env/1, otp_7461/1, otp_7461_remote/1, otp_8209/1, zdbbl_dist_buf_busy_limit/1]).
+-export([args_file/1, evil_args_file/1, env/1, args_file_env/1,
+         otp_7461/1, otp_7461_remote/1, otp_8209/1,
+         zdbbl_dist_buf_busy_limit/1]).
 
 -include_lib("common_test/include/ct.hrl").
-    
 
 init_per_testcase(Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     SavedEnv = save_env(),
-    [{testcase, Case}, {watchdog, Dog}, {erl_flags_env, SavedEnv} |Config].
+    [{testcase, Case},{erl_flags_env, SavedEnv}|Config].
 
 end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
     SavedEnv = ?config(erl_flags_env, Config),
     restore_env(SavedEnv),
     cleanup_nodes(),
-    ?t:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [args_file, evil_args_file, env, args_file_env,
      otp_7461, otp_8209, zdbbl_dist_buf_busy_limit].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 otp_8209(doc) ->
     ["Test that plain first argument does not "
      "destroy -home switch [OTP-8209]"];
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index 91adbc05c0..889aeb8969 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -28,13 +28,7 @@
 -module(ethread_SUITE).
 -author('[email protected]').
 
-%-define(line_trace, 1).
-
--define(DEFAULT_TIMEOUT, ?t:minutes(10)).
-
--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, init_per_testcase/2, end_per_testcase/2]).
 
 -export([create_join_thread/1,
 	 equal_tids/1,
@@ -53,7 +47,11 @@
 
 -include_lib("common_test/include/ct.hrl").
 
-tests() ->
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 10}}].
+
+all() ->
     [create_join_thread,
      equal_tids,
      mutex,
@@ -69,26 +67,19 @@ tests() ->
      atomic,
      dw_atomic_massage].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    tests().
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
+init_per_testcase(Case, Config) ->
+    case inet:gethostname() of
+	{ok,"fenris"} when Case == max_threads ->
+	    %% Cannot use os:type+os:version as not all
+	    %% solaris10 machines are buggy.
+	    {skip, "This machine is buggy"};
+	_Else ->
+            Config
+    end.
 
-end_per_suite(_Config) ->
+end_per_testcase(_Case, _Config) ->
     ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 %%
 %%
 %% The test-cases
@@ -215,22 +206,6 @@ dw_atomic_massage(Config) ->
 %%
 %%
 
-init_per_testcase(Case, Config) ->
-    case inet:gethostname() of
-	{ok,"fenris"} when Case == max_threads ->
-	    %% Cannot use os:type+os:version as not all
-	    %% solaris10 machines are buggy.
-	    {skip, "This machine is buggy"};
-	_Else ->
-	    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-	    [{watchdog, Dog}|Config]
-    end.
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
 -define(TESTPROG, "ethread_tests").
 -define(FAILED_MARKER, $E,$T,$H,$R,$-,$T,$E,$S,$T,$-,$F,$A,$I,$L,$U,$R,$E).
 -define(SKIPPED_MARKER, $E,$T,$H,$R,$-,$T,$E,$S,$T,$-,$S,$K,$I,$P).
diff --git a/erts/test/install_SUITE.erl b/erts/test/install_SUITE.erl
index 1832289337..11a009a48b 100644
--- a/erts/test/install_SUITE.erl
+++ b/erts/test/install_SUITE.erl
@@ -28,11 +28,9 @@
 %%%-------------------------------------------------------------------
 -module(install_SUITE).
 
-%-define(line_trace, 1).
-
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,
+         init_per_suite/1, end_per_suite/1,
+         init_per_testcase/2, end_per_testcase/2]).
 
 -export([bin_default/1,
 	 bin_default_dirty/1,
@@ -49,7 +47,6 @@
 	 bin_dirname_fail/1,
 	 bin_no_use_dirname_fail/1]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(1)).
 -define(JOIN(A,B,C), filename:join(A, B, C)).
 
 -include_lib("common_test/include/ct.hrl").
@@ -77,20 +74,13 @@ dont_need_symlink_cases() ->
      bin_unreasonable_path, 'bin white space',
      bin_no_srcfile].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     dont_need_symlink_cases() ++ need_symlink_cases().
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 %%
 %% The test cases
@@ -586,18 +576,13 @@ init_per_testcase_aux(false, OsType, Case, Config) ->
 	true -> {skip, "Cannot create symbolic links"}
     end;
 init_per_testcase_aux(true, _OsType, Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, Dog},
-     {testcase, Case},
+    [{testcase, Case},
      {test_dir, make_dirs(?config(priv_dir, Config), atom_to_list(Case))}
      | Config].
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-
 make_dirs(Root, Suffix) ->
     do_make_dirs(Root, string:tokens(Suffix, [$/])).
 
diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl
index f40a8114a0..3a8d8be197 100644
--- a/erts/test/nt_SUITE.erl
+++ b/erts/test/nt_SUITE.erl
@@ -23,18 +23,19 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
--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,nt/1,handle_eventlog/2,
+-export([all/0, suite/0,
+         init_per_testcase/2, end_per_testcase/2,
+         nt/1,handle_eventlog/2,
          middleman/1,service_basic/1, service_env/1, user_env/1, synced/1,
          service_prio/1,
          logout/1, debug/1, restart/1, restart_always/1,stopaction/1,
          shutdown_io/0,do_shutdown_io/0]).
--define(TEST_TIMEOUT, ?t:seconds(180)).
 
 -define(TEST_SERVICES, [1,2,3,4,5,6,7,8,9,10,11]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     case os:type() of
@@ -45,33 +46,13 @@ all() ->
         _ -> [nt]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(?TEST_TIMEOUT),
-    [{watchdog, Dog} | Config].
+    Config.
 
-end_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, _Config) ->
     lists:foreach(fun(X) -> 
                           catch remove_service("test_service_" ++ integer_to_list(X))
-                  end,
-                  ?TEST_SERVICES),
-    Dog = ?config(watchdog, Config),
-    catch test_server:timetrap_cancel(Dog),
+                  end, ?TEST_SERVICES),
     ok.    
 
 erlsrv() ->
@@ -92,7 +73,6 @@ recv_prog_output(Port) ->
             end
     end.
 
-
 %%% X == parameters to erlsrv
 %%% returns command output without stderr
 do_command(X) ->
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) ->
diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl
index 1602466f05..f31f76b8bc 100644
--- a/erts/test/run_erl_SUITE.erl
+++ b/erts/test/run_erl_SUITE.erl
@@ -20,43 +20,19 @@
 
 -module(run_erl_SUITE).
 
--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,
-	 basic/1,heavy/1,heavier/1,defunct/1]).
+-export([all/0, suite/0]).
+-export([basic/1,heavy/1,heavier/1,defunct/1]).
 -export([ping_me_back/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(2)),
-    [{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, 2}}].
 
 all() -> 
     [basic, heavy, heavier, defunct].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 basic(Config) when is_list(Config) ->
     case os:type() of
@@ -103,12 +79,12 @@ heavy_1(Config) ->
     end,
 
     case count_new_lines(ToErl, 0) of
-	      Nls when Nls > 30000 ->
-		  ok;
-	      Nls ->
-		  io:format("new_lines: ~p\n", [Nls]),
-		  ?t:fail()
-	  end.
+        Nls when Nls > 30000 ->
+            ok;
+        Nls ->
+            io:format("new_lines: ~p\n", [Nls]),
+            ?t:fail()
+    end.
     
 
 ping_me_back([Node]) when is_atom(Node) ->
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) ->
     [];