Merge branch 'maint'

6 files changed, 241 insertions, 114 deletions

diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 79ed51bc28..8c56d9ffde 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -848,77 +848,124 @@ test_events(timetrap_parallel) ->
 test_events(timetrap_fun) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,start_info,{4,4,17}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{4,4,24}},
+     {?eh,tc_start,{timetrap_4_SUITE,init_per_suite}},
      {?eh,tc_done,{timetrap_4_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{timetrap_4_SUITE,tc0}},
-     {?eh,tc_done,
-      {timetrap_4_SUITE,tc0,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_done,{timetrap_4_SUITE,tc0,
+		   {failed,{timetrap_timeout,{'$approx',1000}}}}},
+     {?eh,test_stats,{0,1,{0,0}}},
      {?eh,tc_start,{timetrap_4_SUITE,tc1}},
-     {?eh,tc_done,
-      {timetrap_4_SUITE,tc1,{failed,{timetrap_timeout,2000}}}},
+     {?eh,tc_done,{timetrap_4_SUITE,tc1,
+		   {failed,{timetrap_timeout,{'$approx',2000}}}}},
+     {?eh,test_stats,{0,2,{0,0}}},
      {?eh,tc_start,{timetrap_4_SUITE,tc2}},
-     {?eh,tc_done,
-      {timetrap_4_SUITE,tc2,{failed,{timetrap_timeout,500}}}},
+     {?eh,tc_done,{timetrap_4_SUITE,tc2,
+		   {failed,{timetrap_timeout,{'$approx',500}}}}},
+     {?eh,test_stats,{0,3,{0,0}}},
      {?eh,tc_start,{timetrap_4_SUITE,tc3}},
-     {?eh,tc_done,
-      {timetrap_4_SUITE,tc3,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_done,{timetrap_4_SUITE,tc3,
+		   {failed,{timetrap_timeout,{'$approx',1000}}}}},
      {?eh,test_stats,{0,4,{0,0}}},
+     {?eh,tc_start,{timetrap_4_SUITE,end_per_suite}},
      {?eh,tc_done,{timetrap_4_SUITE,end_per_suite,ok}},
 
+     {?eh,tc_start,{timetrap_5_SUITE,init_per_suite}},
      {?eh,tc_done,{timetrap_5_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{timetrap_5_SUITE,tc0}},
-     {?eh,tc_done,
-      {timetrap_5_SUITE,tc0,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc0,
+		   {failed,{timetrap_timeout,{'$approx',1000}}}}},
      {?eh,test_stats,{0,5,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc1}},
-     {?eh,tc_done,
-      {timetrap_5_SUITE,tc1,{skipped,{timetrap_error,kaboom}}}},
+     {?eh,tc_done,{undefined,undefined,{user_timetrap_error,
+					{kaboom,'_'}}}},
+     {?eh,test_stats,{0,6,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc2}},
-     {?eh,tc_done,
-      {timetrap_5_SUITE,tc2,{skipped,{timetrap_error,kaboom}}}},
+     {?eh,tc_done,{undefined,undefined,{user_timetrap_error,
+					{kaboom,'_'}}}},
+     {?eh,test_stats,{0,7,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc3}},
-     {?eh,tc_done,
-      {timetrap_5_SUITE,tc3,
-       {skipped,{invalid_time_format,{timetrap_utils,timetrap_val,[5000]}}}}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc3,
+		   {failed,{timetrap_timeout,{'$approx',2000}}}}},
+     {?eh,test_stats,{0,8,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc4}},
-     {?eh,tc_done,
-      {timetrap_5_SUITE,tc4,{skipped,{invalid_time_format,'_'}}}},
-     {?eh,test_stats,{0,5,{0,4}}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc4,
+		   {failed,{timetrap_timeout,{'$approx',500}}}}},
+     {?eh,test_stats,{0,9,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc5}},
-     {?eh,tc_done,
-      {timetrap_5_SUITE,tc5,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc5,
+		   {failed,{timetrap_timeout,{'$approx',1000}}}}},
+     {?eh,test_stats,{0,10,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc6}},
-     {?eh,tc_done,
-      {timetrap_5_SUITE,tc6,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc6,
+		   {failed,{timetrap_timeout,{'$approx',41000}}}}},
+     {?eh,test_stats,{0,11,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc7}},
-     {?eh,tc_done,
-      {timetrap_5_SUITE,tc7,{failed,{timetrap_timeout,1000}}}},
-     {?eh,test_stats,{0,8,{0,4}}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc7,
+		   {failed,{timetrap_timeout,{'$approx',3000}}}}},
+     {?eh,test_stats,{0,12,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc8}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc8,
+		   {failed,{timetrap_timeout,{'$approx',7000}}}}},
+     {?eh,test_stats,{0,13,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc9}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc9,
+		   {failed,{timetrap_timeout,{'$approx',2000}}}}},
+     {?eh,test_stats,{0,14,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc10}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc10,
+		   {failed,{timetrap_timeout,{'$approx',1500}}}}},
+     {?eh,test_stats,{0,15,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc11}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc11,
+		   {failed,{timetrap_timeout,{'$approx',1500}}}}},
+     {?eh,test_stats,{0,16,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc12}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc12,
+		   {failed,{timetrap_timeout,{'$approx',1000}}}}},
+     {?eh,test_stats,{0,17,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc13}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc13,
+		   {failed,{timetrap_timeout,{'$approx',500}}}}},
+     {?eh,test_stats,{0,18,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc14}},
+     {?eh,tc_done,{timetrap_5_SUITE,tc14,
+		   {failed,{timetrap_timeout,{'$approx',1000}}}}},
+     {?eh,test_stats,{0,19,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,end_per_suite}},
      {?eh,tc_done,{timetrap_5_SUITE,end_per_suite,ok}},
 
      {?eh,tc_start,{timetrap_6_SUITE,init_per_suite}},
-     {?eh,tc_done,
-      {timetrap_6_SUITE,init_per_suite,{skipped,{timetrap_error,kaboom}}}},
-     {?eh,tc_auto_skip,
-      {timetrap_6_SUITE,tc0,{timetrap_error,kaboom}}},
-     {?eh,test_stats,{0,8,{0,5}}},
-     {?eh,tc_auto_skip,
-      {timetrap_6_SUITE,end_per_suite,{timetrap_error,kaboom}}},
-
+     {?eh,tc_done,{undefined,undefined,{user_timetrap_error,
+					{kaboom,'_'}}}},
+     {?eh,tc_auto_skip,{timetrap_6_SUITE,tc0,
+			{failed,{timetrap_6_SUITE,init_per_suite,
+				 {user_timetrap_error,{kaboom,'_'}}}}}},
+     {?eh,test_stats,{0,19,{0,1}}},
+     {?eh,tc_auto_skip,{timetrap_6_SUITE,end_per_suite,
+			{failed,{timetrap_6_SUITE,init_per_suite,
+				 {user_timetrap_error,{kaboom,'_'}}}}}},
+
+     {?eh,tc_start,{timetrap_7_SUITE,init_per_suite}},
      {?eh,tc_done,{timetrap_7_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{timetrap_7_SUITE,tc0}},
-     {?eh,tc_done,
-      {timetrap_7_SUITE,tc0,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_done,{timetrap_7_SUITE,tc0,
+		   {failed,{timetrap_timeout,{'$approx',7000}}}}},
+     {?eh,test_stats,{0,20,{0,1}}},
      {?eh,tc_start,{timetrap_7_SUITE,tc1}},
-     {?eh,tc_done,
-      {timetrap_7_SUITE,tc1,{failed,{timetrap_timeout,2000}}}},
+     {?eh,tc_done,{timetrap_7_SUITE,tc1,
+		   {failed,{timetrap_timeout,{'$approx',2000}}}}},
+     {?eh,test_stats,{0,21,{0,1}}},
      {?eh,tc_start,{timetrap_7_SUITE,tc2}},
-     {?eh,tc_done,
-      {timetrap_7_SUITE,tc2,{failed,{timetrap_timeout,500}}}},
+     {?eh,tc_done,{timetrap_7_SUITE,tc2,
+		   {failed,{timetrap_timeout,{'$approx',500}}}}},
+     {?eh,test_stats,{0,22,{0,1}}},
      {?eh,tc_start,{timetrap_7_SUITE,tc3}},
-     {?eh,tc_done,
-      {timetrap_7_SUITE,tc3,{failed,{timetrap_timeout,1000}}}},
-     {?eh,test_stats,{0,12,{0,5}}},
+     {?eh,tc_done,{timetrap_7_SUITE,tc3,
+		   {failed,{timetrap_timeout,{'$approx',7000}}}}},
+     {?eh,test_stats,{0,23,{0,1}}},
+     {?eh,tc_start,{timetrap_7_SUITE,end_per_suite}},
      {?eh,tc_done,{timetrap_7_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_5_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_5_SUITE.erl
index c5d4b5062e..58042c04fc 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_5_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_5_SUITE.erl
@@ -108,7 +108,8 @@ groups() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 all() ->
-    [tc0,tc1,tc2,tc3,tc4,tc5,tc6,tc7].
+    [tc0,tc1,tc2,tc3,tc4,tc5,tc6,tc7,tc8,tc9,
+     tc10,tc11,tc12,tc13,tc14].
 
 tc0(_) ->
     ct:comment(io_lib:format("TO after ~w sec", [?TO])),
@@ -126,30 +127,89 @@ tc2(_) ->
     exit(this_should_not_execute).
 
 tc3() ->
-    [{timetrap,{timetrap_utils,timetrap_err_mfa,[]}}].
-tc3(_) ->
-    exit(this_should_not_execute).
+    [{timetrap,{timetrap_utils,timetrap_val,[{seconds,2}]}}].
+tc3(_) ->  
+    ct:comment("TO after ~2 sec"),
+    ct:sleep({seconds,10}),
+    ok.
 
 tc4() ->
-    [{timetrap,fun() -> timetrap_utils:timetrap_err_fun() end}].
-tc4(_) ->
-    exit(this_should_not_execute).
+    [{timetrap,fun() -> 500 end}].
+tc4(_) ->  
+    ct:comment("TO after 500 ms"),
+    ct:sleep({seconds,10}),
+    ok.
 
 tc5() ->
+   [{timetrap,{timetrap_utils,timetrap_timeout,[1000,ok]}}].
+tc5(_) ->    
+    ct:comment("TO after ~1 sec"),
+    ct:sleep({seconds,10}),
+    ok.
+
+tc6() ->
     [{timetrap,{timetrap_utils,timetrap_timeout,[{seconds,40},
 						 {seconds,1}]}}].
-tc5(_) ->    
+tc6(_) ->    
     ct:comment("TO after 40+1 sec"),
     ct:sleep({seconds,42}),
     ok.
 
-tc6() ->
+tc7() ->
+    [{timetrap,{timetrap_utils,timetrap_timeout,[1000,2000]}}].
+tc7(_) ->
+    ct:comment("TO after ~3 sec"),
+    ct:sleep({seconds,10}),
+    ok.
+
+tc8() ->
     [{timetrap,fun() -> ct:sleep(6000), 1000 end}].
-tc6(_) ->
+tc8(_) ->
     ct:comment("TO after 6+1 sec"),
-    ct:sleep({seconds,10}).
+    ct:sleep({seconds,10}),
+    ok.
 
-tc7(_) ->
+tc9() ->
+    [{timetrap,{timetrap_utils,timetrap_timeout,
+		[500,fun() -> {seconds,2} end]}}].
+tc9(_) ->
+    ct:comment("TO after ~2 sec (2.5 sec in reality)"),
+    ct:sleep({seconds,10}),
+    ok.
+
+tc10() ->
+    [{timetrap,500}].
+tc10(_) ->
+    ct:timetrap({timetrap_utils,timetrap_val,[1500]}),   
+    ct:comment("TO after ~1.5 sec"),
+    ct:sleep({seconds,10}),
+    ok.
+
+tc11() ->
+    [{timetrap,2000}].
+tc11(_) ->
+    ct:timetrap(fun() -> 1500 end),
+    ct:comment("TO after ~1.5 sec"),
+    ct:sleep({seconds,10}),
+    ok.
+    
+tc12() ->
+    [{timetrap,500}].
+tc12(_) ->
+    ct:timetrap({timetrap_utils,timetrap_timeout,[1000,ok]}),   
+    ct:comment("TO after ~1 sec"),
+    ct:sleep({seconds,10}),
+    ok.
+
+tc13() ->
+    [{timetrap,2000}].
+tc13(_) ->
+    ct:timetrap(fun() -> ct:sleep(500), ok end),
+    ct:comment("TO after ~500 ms"),
+    ct:sleep({seconds,10}),
+    ok.
+
+tc14(_) ->
     ct:comment(io_lib:format("TO after ~w sec", [?TO])),
     ct:sleep({seconds,5}),
     ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_7_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_7_SUITE.erl
index b25b7770a7..62de959458 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_7_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_7_SUITE.erl
@@ -114,7 +114,7 @@ all() ->
 
 tc0(_) ->
     ct:comment(io_lib:format("TO after ~w+~w sec", [?HANG,?TO])),
-    ct:sleep({seconds,5}),
+    ct:sleep({seconds,10}),
     ok.
 
 tc1() ->
@@ -133,5 +133,5 @@ tc2(_) ->
 
 tc3(_) ->
     ct:comment(io_lib:format("TO after ~w+~w sec", [?HANG,?TO])),
-    ct:sleep({seconds,5}),
+    ct:sleep({seconds,10}),
     ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_utils.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_utils.erl
index fcde6cd701..016014b03a 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_utils.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_utils.erl
@@ -20,24 +20,15 @@
 -module(timetrap_utils).
 
 -export([timetrap_val/1,
-	 timetrap_err_fun/0,
-	 timetrap_err_mfa/0,
 	 timetrap_exit/1,
 	 timetrap_timeout/2]).
 
 timetrap_val(Val) ->
     Val.
 
-timetrap_err_fun() ->
-    fun() -> 5000 end.
-
-timetrap_err_mfa() ->
-    {?MODULE,timetrap_val,[5000]}.
-
 timetrap_exit(Reason) ->
     exit(Reason).
 
 timetrap_timeout(Sleep, Val) ->
     ct:sleep(Sleep),
     Val.
-	    
diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
index 1471cc1e0c..d8cb6318c1 100644
--- a/lib/common_test/test/ct_master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -98,7 +98,7 @@ end_per_group(_GroupName, Config) ->
 %%--------------------------------------------------------------------
 %% TEST CASES
 %%--------------------------------------------------------------------
-ct_master_test(Config) when is_list(Config)->
+ct_master_test(Config) when is_list(Config) ->
     NodeNames = proplists:get_value(node_names, Config),
     DataDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config),
@@ -106,19 +106,14 @@ ct_master_test(Config) when is_list(Config)->
     FileName = filename:join(PrivDir, "ct_master_spec.spec"),
     Suites = [master_SUITE],
     TSFile = make_spec(DataDir, FileName, NodeNames, Suites, Config),
+
     ERPid = ct_test_support:start_event_receiver(Config),
-    spawn(ct@ancalagon,
-	  fun() ->
-		  dbg:tracer(),dbg:p(all,c),
-		  dbg:tpl(erlang, spawn_link, 4,x),
-		  receive ok -> ok end
-	  end),
 
-    [{TSFile, ok}] = run_test(ct_master_test, FileName, Config),
+    [{TSFile,ok}] = run_test(ct_master_test, FileName, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
 
-    ct_test_support:log_events(groups_suite_1, 
+    ct_test_support:log_events(ct_master_test, 
 			       reformat(Events, ?eh),
 			       PrivDir, []),
 
@@ -134,48 +129,59 @@ ct_master_test(Config) when is_list(Config)->
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
-make_spec(DataDir, FileName, NodeNames, Suites, Config)->
-    {ok, HostName} = inet:gethostname(),
+make_spec(DataDir, FileName, NodeNames, Suites, Config) ->
+    {ok,HostName} = inet:gethostname(),
 
-    N = lists:map(fun(NodeName)->
+    N = lists:map(fun(NodeName) ->
 	    {node, NodeName, list_to_atom(atom_to_list(NodeName)++"@"++HostName)}
 	end,
 	NodeNames),
 
-    C = lists:map(fun(NodeName)->
-	Rnd = random:uniform(2),
-	if Rnd == 1->
-	    {config, NodeName, filename:join(DataDir, "master/config.txt")};
-	true->
-	    {userconfig, NodeName, {ct_config_xml, filename:join(DataDir, "master/config.xml")}}
-        end
-	end,
-	NodeNames),
-
-    NS = lists:map(fun(NodeName)->
-	     {init, NodeName, [
-				{node_start, [{startup_functions, []}, {monitor_master, true}]},
-				{eval, {erlang, nodes, []}}
-			      ]
-	     }
-	 end,
-	 NodeNames),
-
+    C = lists:map(
+	  fun(NodeName) ->
+		  Rnd = random:uniform(2),
+		  if Rnd == 1->
+			  {config,NodeName,filename:join(DataDir,
+							 "master/config.txt")};
+		     true ->
+			  {userconfig,NodeName,
+			   {ct_config_xml,filename:join(DataDir,
+							"master/config.xml")}}
+		  end
+	  end,
+	  NodeNames),
+    
+    CM = [{config,master,filename:join(DataDir,"master/config.txt")}],
+
+    NS = lists:map(
+	   fun(NodeName) ->
+		   {init,NodeName,[
+				   {node_start,[{startup_functions,[]},
+						{monitor_master,true}]},
+				   {eval,{erlang,nodes,[]}}
+				  ]
+		   }
+	   end,
+	   NodeNames),
+    
     S = [{suites, NodeNames, filename:join(DataDir, "master"), Suites}],
-
+    
     PrivDir = ?config(priv_dir, Config),
-    LD = lists:map(fun(NodeName)->
-	     {logdir, NodeName, get_log_dir(os:type(),PrivDir, NodeName)}
-         end,
-	 NodeNames) ++ [{logdir, master, PrivDir}],
+
+    LD = lists:map(
+	   fun(NodeName) ->
+		   {logdir,NodeName,get_log_dir(os:type(),PrivDir, NodeName)}
+	   end,
+	   NodeNames) ++ [{logdir,master,PrivDir}],
+
     EvHArgs = [{cbm,ct_test_support},{trace_level,?config(trace_level,Config)}],
     EH = [{event_handler,master,[?eh],EvHArgs}],
-
+    
     Include = [{include,filename:join([DataDir,"master/include"])}],
+    
+    ct_test_support:write_testspec(N++Include++EH++C++CM++S++LD++NS, FileName).
 
-    ct_test_support:write_testspec(N++Include++EH++C++S++LD++NS, FileName).
-
-get_log_dir({win32,_}, _PrivDir, NodeName)->
+get_log_dir({win32,_}, _PrivDir, NodeName) ->
     case filelib:is_dir(?TEMP_DIR) of
 	false ->
 	    file:make_dir(?TEMP_DIR);
@@ -188,8 +194,15 @@ get_log_dir(_,PrivDir,NodeName) ->
     file:make_dir(LogDir),
     LogDir.
 
-run_test(_Name, FileName, Config)->
-    [{FileName, ok}] = ct_test_support:run(ct_master, run, [FileName], Config).
+run_test(_Name, FileName, Config) ->
+    %% run the test twice, using different html versions
+    [{FileName,ok}] = ct_test_support:run({ct_master,run,[FileName]},
+					  [{ct_master,basic_html,[true]}],
+					  Config),
+    timer:sleep(5000),
+    [{FileName,ok}] = ct_test_support:run({ct_master,run,[FileName]},
+					  [{ct_master,basic_html,[false]}],
+					  Config).
 
 reformat(Events, EH) ->
     ct_test_support:reformat(Events, EH).
@@ -220,5 +233,5 @@ add_host(NodeName) ->
     {ok, HostName} = inet:gethostname(),
     list_to_atom(atom_to_list(NodeName)++"@"++HostName).
     
-expected_events(_)->
+expected_events(_) ->
     [].
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 6df02d12b7..62c167d78b 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -29,7 +29,7 @@
 -export([init_per_suite/1, init_per_suite/2, end_per_suite/1,
 	 init_per_testcase/2, end_per_testcase/2,
 	 write_testspec/2, write_testspec/3,
-	 run/2, run/4, get_opts/1, wait_for_ct_stop/1]).
+	 run/2, run/3, run/4, get_opts/1, wait_for_ct_stop/1]).
 
 -export([handle_event/2, start_event_receiver/1, get_events/2,
 	 verify_events/3, reformat/2, log_events/4,
@@ -223,7 +223,7 @@ get_opts(Config) ->
 
 %%%-----------------------------------------------------------------
 %%% 
-run(Opts, Config) ->
+run(Opts, Config) when is_list(Opts) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
     %% use ct interface
@@ -256,9 +256,19 @@ run(Opts, Config) ->
     end.
 
 run(M, F, A, Config) ->
+    run({M,F,A}, [], Config).
+
+run({M,F,A}, InitCalls, Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
-    test_server:format(Level, "~nCalling ~w:~w(~p) on ~p~n",
+    lists:foreach(
+      fun({IM,IF,IA}) ->
+	      test_server:format(Level, "~nInit call ~w:~w(~p) on ~p...~n",
+				 [IM, IF, IA, CTNode]),
+	      Result = rpc:call(CTNode, IM, IF, IA),
+	      test_server:format(Level, "~n...with result: ~p~n", [Result])
+      end, InitCalls),
+    test_server:format(Level, "~nStarting test with ~w:~w(~p) on ~p~n",
 		       [M, F, A, CTNode]),
     rpc:call(CTNode, M, F, A).
 
@@ -1001,6 +1011,12 @@ result_match({SkipOrFail,{ErrorInd,{Why,'_'}}},
 result_match({SkipOrFail,{ErrorInd,{EMod,EFunc,{Why,'_'}}}},
 	    {SkipOrFail,{ErrorInd,{EMod,EFunc,{Why,_Stack}}}}) ->
     true;
+result_match({failed,{timetrap_timeout,{'$approx',Num}}},
+	     {failed,{timetrap_timeout,Value}}) ->
+    if Value >= trunc(Num-0.01*Num),
+       Value =< trunc(Num+0.01*Num) -> true;
+       true -> false
+    end;
 result_match(Result, Result) ->
     true;
 result_match(_, _) ->