1 files changed, 33 insertions, 57 deletions
diff --git a/erts/emulator/test/fun_r13_SUITE.erl b/erts/emulator/test/fun_r13_SUITE.erl
index 39e8b3c324..d66026705b 100644
--- a/erts/emulator/test/fun_r13_SUITE.erl
+++ b/erts/emulator/test/fun_r13_SUITE.erl
@@ -21,77 +21,53 @@
 -module(fun_r13_SUITE).
 -compile(r13).
 
--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,dist_old_release/1]).
+-export([all/0, suite/0,
+         dist_old_release/1]).
 
--define(default_timeout, ?t:minutes(1)).
 -include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() ->
     [dist_old_release].
 
-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(_Case, Config) ->
-    ?line Dog = test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
 dist_old_release(Config) when is_list(Config) ->
-    case ?t:is_release_available("r12b") of
-	true -> do_dist_old(Config);
-	false -> {skip,"No R12B found"}
+    case test_server:is_release_available("r12b") of
+        true -> do_dist_old(Config);
+        false -> {skip,"No R12B found"}
     end.
 
 do_dist_old(Config) when is_list(Config) ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
+    Pa = filename:dirname(code:which(?MODULE)),
     Name = fun_dist_r12,
-    ?line {ok,Node} = ?t:start_node(Name, peer,
-				    [{args,"-pa "++Pa},
-				     {erl,[{release,"r12b"}]}]),
-
-    ?line Pid = spawn_link(Node,
-			   fun() ->
-				   receive
-				       Fun when is_function(Fun) ->
-					   R12BFun = fun(H) -> cons(H, [b,c]) end,
-					   Fun(Fun, R12BFun)
-				   end
-			   end),
+    {ok,Node} = test_server:start_node(Name, peer,
+                                       [{args,"-pa "++Pa},
+                                        {erl,[{release,"r12b"}]}]),
+
+    Pid = spawn_link(Node,
+                     fun() ->
+                             receive
+                                 Fun when is_function(Fun) ->
+                                     R12BFun = fun(H) -> cons(H, [b,c]) end,
+                                     Fun(Fun, R12BFun)
+                             end
+                     end),
     Self = self(),
     Fun = fun(F, R12BFun) ->
-		  {pid,Self} = erlang:fun_info(F, pid),
-		  {module,?MODULE} = erlang:fun_info(F, module),
-		  Self ! {ok,F,R12BFun}
-	  end,
-    ?line Pid ! Fun,
-    ?line receive
-	      {ok,Fun,R12BFun} ->
-		  ?line [a,b,c] = R12BFun(a);
-	      Other ->
-		  ?line ?t:fail({bad_message,Other})
-	  end,
+                  {pid,Self} = erlang:fun_info(F, pid),
+                  {module,?MODULE} = erlang:fun_info(F, module),
+                  Self ! {ok,F,R12BFun}
+          end,
+    Pid ! Fun,
+    receive
+        {ok,Fun,R12BFun} ->
+            [a,b,c] = R12BFun(a);
+        Other ->
+            ct:fail({bad_message,Other})
+    end,
+    true = test_server:stop_node(Node),
     ok.
 
 cons(H, T) ->