1 files changed, 26 insertions, 37 deletions
diff --git a/erts/emulator/test/mtx_SUITE.erl b/erts/emulator/test/mtx_SUITE.erl
index 87dace4721..c7c043d8e7 100644
--- a/erts/emulator/test/mtx_SUITE.erl
+++ b/erts/emulator/test/mtx_SUITE.erl
@@ -29,9 +29,8 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--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([long_rwlock/1,
 	 hammer_ets_rwlock/1,
@@ -56,6 +55,28 @@
 	 hammer_sched_freqread_tryrwlock/1,
 	 hammer_sched_freqread_tryrwlock_check/1]).
 
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 15}}].
+
+all() ->
+    [long_rwlock, hammer_rwlock_check, hammer_rwlock,
+     hammer_tryrwlock_check, hammer_tryrwlock,
+     hammer_ets_rwlock, hammer_sched_long_rwlock_check,
+     hammer_sched_long_rwlock,
+     hammer_sched_long_freqread_rwlock_check,
+     hammer_sched_long_freqread_rwlock,
+     hammer_sched_long_tryrwlock_check,
+     hammer_sched_long_tryrwlock,
+     hammer_sched_long_freqread_tryrwlock_check,
+     hammer_sched_long_freqread_tryrwlock,
+     hammer_sched_rwlock_check, hammer_sched_rwlock,
+     hammer_sched_freqread_rwlock_check,
+     hammer_sched_freqread_rwlock,
+     hammer_sched_tryrwlock_check, hammer_sched_tryrwlock,
+     hammer_sched_freqread_tryrwlock_check,
+     hammer_sched_freqread_tryrwlock].
+
 init_per_suite(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     Lib = filename:join([DataDir, atom_to_list(?MODULE)]),
@@ -71,15 +92,13 @@ end_per_suite(Config) when is_list(Config) ->
     Config.
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(15)),
     %% Wait for deallocations to complete since we measure
     %% runtime in test cases.
     wait_deallocations(),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+    ok.
 
 wait_deallocations() ->
     try
@@ -90,36 +109,6 @@ wait_deallocations() ->
 	    wait_deallocations()
     end.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [long_rwlock, hammer_rwlock_check, hammer_rwlock,
-     hammer_tryrwlock_check, hammer_tryrwlock,
-     hammer_ets_rwlock, hammer_sched_long_rwlock_check,
-     hammer_sched_long_rwlock,
-     hammer_sched_long_freqread_rwlock_check,
-     hammer_sched_long_freqread_rwlock,
-     hammer_sched_long_tryrwlock_check,
-     hammer_sched_long_tryrwlock,
-     hammer_sched_long_freqread_tryrwlock_check,
-     hammer_sched_long_freqread_tryrwlock,
-     hammer_sched_rwlock_check, hammer_sched_rwlock,
-     hammer_sched_freqread_rwlock_check,
-     hammer_sched_freqread_rwlock,
-     hammer_sched_tryrwlock_check, hammer_sched_tryrwlock,
-     hammer_sched_freqread_tryrwlock_check,
-     hammer_sched_freqread_tryrwlock].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
 long_rwlock(Config) when is_list(Config) ->
     statistics(runtime),
     LLRes = long_rw_test(),