Always report ok to event handlers after successful cfg or tc func

Also make sure test_server never reports failures that can be
mistaken for positive results.

11 files changed, 145 insertions, 223 deletions

diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index ec525784ec..498950c9d1 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -686,18 +686,21 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 	    undefined ->
 		%% send sync notification so that event handlers may print
 		%% in the log file before it gets closed
-		ct_event:sync_notify(#event{name=tc_done,
-					    node=node(),
-					    data={Mod,FuncSpec,
-						  tag_cth(FinalNotify)}}),
+		Event = #event{name=tc_done,
+			       node=node(),
+			       data={Mod,FuncSpec,
+				     tag(FinalNotify)}},
+		ct_event:sync_notify(Event),
 		Result1;
 	    Fun ->
 		%% send sync notification so that event handlers may print
 		%% in the log file before it gets closed
-		ct_event:sync_notify(#event{name=tc_done,
-					    node=node(),
-					    data={Mod,FuncSpec,
-						  tag(FinalNotify)}}),
+		Event = #event{name=tc_done,
+			       node=node(),
+			       data={Mod,FuncSpec,
+				     tag({'$test_server_framework_test',
+					  FinalNotify})}},
+		ct_event:sync_notify(Event),
 		Fun(end_tc, Return)
 	end,    
 
@@ -770,44 +773,37 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 
 %% {error,Reason} | {skip,Reason} | {timetrap_timeout,TVal} | 
 %% {testcase_aborted,Reason} | testcase_aborted_or_killed | 
-%% {'EXIT',Reason} | Other (ignored return value, e.g. 'ok')
-tag({STag,Reason}) when STag == skip; STag == skipped ->
-    case Reason of
-	{failed,{_,init_per_testcase,_}} -> {auto_skipped,Reason};
-	_ -> {skipped,Reason}
-    end;
-tag({auto_skip,Reason}) ->
-    {auto_skipped,Reason};
-tag(E = {ETag,_}) when ETag == error; ETag == 'EXIT'; 
-                       ETag == timetrap_timeout;
-                       ETag == testcase_aborted -> 
-    {failed,E};
-tag(E = testcase_aborted_or_killed) ->
-    {failed,E};
-tag(Other) ->
-    Other.
-
-tag_cth({skipped,Reason={failed,{_,init_per_testcase,_}}}) ->
+%% {'EXIT',Reason} | {fail,Reason} | {failed,Reason} |
+%% {user_timetrap_error,Reason} |
+%% Other (ignored return value, e.g. 'ok')
+tag({'$test_server_framework_test',Result}) ->
+    case tag(Result) of
+	ok      -> Result;
+	Failure -> Failure
+    end;	    
+tag({skipped,Reason={failed,{_,init_per_testcase,_}}}) ->
     {auto_skipped,Reason};
-tag_cth({STag,Reason}) when STag == skip; STag == skipped -> 
+tag({STag,Reason}) when STag == skip; STag == skipped -> 
     case Reason of
 	{failed,{_,init_per_testcase,_}} -> {auto_skipped,Reason};
 	_ -> {skipped,Reason}
     end;
-tag_cth({auto_skip,Reason}) ->
+tag({auto_skip,Reason}) ->
     {auto_skipped,Reason};
-tag_cth({fail,Reason}) ->
+tag({fail,Reason}) ->
     {failed,{error,Reason}};
-tag_cth(E = {ETag,_}) when ETag == error; ETag == 'EXIT'; 
+tag(Failed = {failed,_Reason}) ->
+    Failed;
+tag(E = {ETag,_}) when ETag == error; ETag == 'EXIT'; 
 			   ETag == timetrap_timeout;
 			   ETag == testcase_aborted -> 
     {failed,E};
-tag_cth(E = testcase_aborted_or_killed) ->
+tag(E = testcase_aborted_or_killed) ->
     {failed,E};
-tag_cth(List) when is_list(List) ->
-    ok;
-tag_cth(Other) ->
-    Other.
+tag(UserTimetrap = {user_timetrap_error,_Reason}) ->
+    UserTimetrap;
+tag(_Other) ->
+    ok.
 
 %%%-----------------------------------------------------------------
 %%% @spec error_notification(Mod,Func,Args,Error) -> ok
@@ -841,6 +837,8 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 			     io_lib:format("{test_case_failed,~p}", [Reason]);
 			 Result -> Result
 		     end;
+		 {'EXIT',_Reason} = EXIT ->
+		     io_lib:format("~P", [EXIT,5]);
 		 {Spec,_Reason} when is_atom(Spec) ->
 		     io_lib:format("~w", [Spec]);
 		 Other ->
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index ecf231529a..8464225284 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -1466,7 +1466,8 @@ test_events(misc_errors) ->
 		   {failed,{error,{suite_failed,this_is_expected}}}}},
      {?eh,test_stats,{0,5,{0,0}}},
      {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_1}},
-     {?eh,tc_done,{misc_error_1_SUITE,killed_by_signal_1,i_die_now}},
+     {?eh,tc_done,{misc_error_1_SUITE,killed_by_signal_1,
+		   {failed,{'EXIT',i_die_now}}}},
      {?eh,test_stats,{0,6,{0,0}}},
      {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_2}},
      {?eh,tc_done,{misc_error_1_SUITE,killed_by_signal_2,
diff --git a/lib/common_test/test/ct_event_handler_SUITE.erl b/lib/common_test/test/ct_event_handler_SUITE.erl
index 750ccb8659..b759424e46 100644
--- a/lib/common_test/test/ct_event_handler_SUITE.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE.erl
@@ -157,21 +157,28 @@ results(Config) when is_list(Config) ->
     TestEvents =
 	[{eh_A,start_logging,{'DEF','RUNDIR'}},
 	 {eh_A,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-	 {eh_A,start_info,{1,1,4}},
+	 {eh_A,start_info,{1,1,5}},
 	 {eh_A,tc_start,{eh_11_SUITE,init_per_suite}},
 	 {eh_A,tc_done,{eh_11_SUITE,init_per_suite,ok}},
-	 {eh_A,tc_start,{eh_11_SUITE,tc1}},
-	 {eh_A,tc_done,{eh_11_SUITE,tc1,ok}},
-	 {eh_A,test_stats,{1,0,{0,0}}},
-	 {eh_A,tc_start,{eh_11_SUITE,tc2}},
-	 {eh_A,tc_done,{eh_11_SUITE,tc2,{skipped,"Skip"}}},
-	 {eh_A,test_stats,{1,0,{1,0}}},
-	 {eh_A,tc_start,{eh_11_SUITE,tc3}},
-	 {eh_A,tc_done,{eh_11_SUITE,tc3,{skipped,"Skipped"}}},
-	 {eh_A,test_stats,{1,0,{2,0}}},
-	 {eh_A,tc_start,{eh_11_SUITE,tc4}},
-	 {eh_A,tc_done,{eh_11_SUITE,tc4,{failed,{error,'Failing'}}}},
-	 {eh_A,test_stats,{1,1,{2,0}}},
+	 [{eh_A,tc_start,{eh_11_SUITE,{init_per_group,g1,[]}}},
+	  {eh_A,tc_done,{eh_11_SUITE,{init_per_group,g1,[]},ok}},
+	  {eh_A,tc_start,{eh_11_SUITE,tc1}},
+	  {eh_A,tc_done,{eh_11_SUITE,tc1,ok}},
+	  {eh_A,test_stats,{1,0,{0,0}}},
+	  {eh_A,tc_start,{eh_11_SUITE,tc2}},
+	  {eh_A,tc_done,{eh_11_SUITE,tc2,ok}},
+	  {eh_A,test_stats,{2,0,{0,0}}},
+	  {eh_A,tc_start,{eh_11_SUITE,tc3}},
+	  {eh_A,tc_done,{eh_11_SUITE,tc3,{skipped,"Skip"}}},
+	  {eh_A,test_stats,{2,0,{1,0}}},
+	  {eh_A,tc_start,{eh_11_SUITE,tc4}},
+	  {eh_A,tc_done,{eh_11_SUITE,tc4,{skipped,"Skipped"}}},
+	  {eh_A,test_stats,{2,0,{2,0}}},
+	  {eh_A,tc_start,{eh_11_SUITE,tc5}},
+	  {eh_A,tc_done,{eh_11_SUITE,tc5,{failed,{error,'Failing'}}}},
+	  {eh_A,test_stats,{2,1,{2,0}}},
+	  {eh_A,tc_start,{eh_11_SUITE,{end_per_group,g1,[]}}},
+	  {eh_A,tc_done,{eh_11_SUITE,{end_per_group,g1,[]},ok}}],
 	 {eh_A,tc_start,{eh_11_SUITE,end_per_suite}},
 	 {eh_A,tc_done,{eh_11_SUITE,end_per_suite,ok}},
 	 {eh_A,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl b/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
index a52fe96f30..14ea12d579 100644
--- a/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
@@ -32,100 +32,36 @@
 %% COMMON TEST CALLBACK FUNCTIONS
 %%--------------------------------------------------------------------
 
-%%--------------------------------------------------------------------
-%% Function: suite() -> Info
-%%
-%% Info = [tuple()]
-%%   List of key/value pairs.
-%%
-%% Description: Returns list of tuples to set default properties
-%%              for the suite.
-%%
-%% Note: The suite/0 function is only meant to be used to return
-%% default data values, not perform any other operations.
-%%--------------------------------------------------------------------
 suite() ->
     [
      {timetrap,{seconds,10}}
     ].
 
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config0) ->
-%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
-%%
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Reason = term()
-%%   The reason for skipping the suite.
-%%
-%% Description: Initialization before the suite.
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
 init_per_suite(Config) ->
     Config.
 
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
-%%
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Cleanup after the suite.
-%%--------------------------------------------------------------------
 end_per_suite(_Config) ->
-    ok.
+    %% should report ok as result to event handler
+    done.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    %% should report ok as result to event handler
+    void.
 
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config0) ->
-%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
-%%
-%% TestCase = atom()
-%%   Name of the test case that is about to run.
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Reason = term()
-%%   The reason for skipping the test case.
-%%
-%% Description: Initialization before each test case.
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
 init_per_testcase(_TestCase, Config) ->
     Config.
 
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config0) ->
-%%               void() | {save_config,Config1}
-%%
-%% TestCase = atom()
-%%   Name of the test case that is finished.
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Cleanup after each test case.
-%%--------------------------------------------------------------------
 end_per_testcase(_TestCase, _Config) ->
-    ok.
+    true.
 
-%%--------------------------------------------------------------------
-%% Function: all() -> TestCases | {skip,Reason}
-%%
-%% TestCases = [TestCase | {sequence,SeqName}]
-%% TestCase = atom()
-%%   Name of a test case.
-%% SeqName = atom()
-%%   Name of a test case sequence.
-%% Reason = term()
-%%   The reason for skipping all test cases.
-%%
-%% Description: Returns the list of test cases that are to be executed.
-%%--------------------------------------------------------------------
-all() -> 
-    [tc1, tc2, tc3, tc4].
+groups() ->
+    [{g1, [], [tc1, tc2, tc3, tc4, tc5]}].
 
+all() -> 
+    [{group,g1}].
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -134,11 +70,15 @@ all() ->
 tc1(_Config) -> 
     ok.
 
-tc2(_Config) -> 
-    {skip,"Skip"}.
+tc2(_Config) ->
+    %% should report ok as result to event handler
+    42.
 
 tc3(_Config) -> 
+    {skip,"Skip"}.
+
+tc4(_Config) -> 
     {skipped,"Skipped"}.
 
-tc4(_Config) ->
+tc5(_Config) ->
     exit('Failing').
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE.erl
index e520a72227..d5de949554 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE.erl
@@ -302,7 +302,7 @@ test_events(groups_suite_1) ->
       {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}];
 
@@ -410,7 +410,7 @@ test_events(groups_suite_2) ->
       {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
       {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
-      {?eh,tc_done,{groups_12_SUITE,end_per_suite,init}},
+      {?eh,tc_done,{groups_12_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}];
 
@@ -505,7 +505,7 @@ test_events(groups_suites_1) ->
       {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,ok}},
 
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
      {?eh,tc_done,{groups_12_SUITE,init_per_suite,ok}},
@@ -596,7 +596,7 @@ test_events(groups_suites_1) ->
       {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_12_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}];
 
@@ -691,7 +691,7 @@ test_events(groups_dir_1) ->
       {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,ok}},
 
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
      {?eh,tc_done,{groups_12_SUITE,init_per_suite,ok}},
@@ -782,7 +782,7 @@ test_events(groups_dir_1) ->
       {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_12_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}];
 
@@ -878,7 +878,7 @@ test_events(groups_dirs_1) ->
       {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,ok}},
 
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
      {?eh,tc_done,{groups_12_SUITE,init_per_suite,ok}},
@@ -969,7 +969,7 @@ test_events(groups_dirs_1) ->
       {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_12_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,ok}},
 
      {?eh,tc_start,{groups_21_SUITE,init_per_suite}},
      {?eh,tc_done,{groups_21_SUITE,init_per_suite,ok}},
@@ -1089,7 +1089,7 @@ test_events(groups_dirs_1) ->
        {groups_21_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_21_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_21_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_21_SUITE,end_per_suite,ok}},
 
      {?eh,tc_start,{groups_22_SUITE,init_per_suite}},
      {?eh,tc_done,{groups_22_SUITE,init_per_suite,ok}},
@@ -1223,6 +1223,6 @@ test_events(groups_dirs_1) ->
        {groups_22_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_22_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_22_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_22_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}].
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl
index 8b0de98709..f41395e028 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl
@@ -302,7 +302,7 @@ test_events(empty_group) ->
       {?eh,tc_done,
        {groups_22_SUITE,{end_per_group,test_group_8,[]},ok}}],
      {?eh,tc_start,{groups_22_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_22_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_22_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ].
diff --git a/lib/common_test/test/ct_repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE.erl
index e37aeb196c..50e07608f6 100644
--- a/lib/common_test/test/ct_repeat_1_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_1_SUITE.erl
@@ -220,8 +220,7 @@ test_events(repeat_cs_and_grs) ->
       {?eh,test_stats,{1,1,{0,0}}},
       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_result,[]},ok}},
        {?eh,test_stats,{2,1,{0,0}}},
-       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_fail_result,[]},
-		     {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_fail_result,[]},ok}}],
       {?eh,test_stats,{3,1,{0,0}}},
       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_init,[]},
 		     {failed,{error,fails_on_purpose}}}},
@@ -242,8 +241,7 @@ test_events(repeat_cs_and_grs) ->
       {?eh,test_stats,{5,2,{0,1}}},
       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_result,[]},ok}},
        {?eh,test_stats,{6,2,{0,1}}},
-       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_fail_result,[]},
-		     {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_fail_result,[]},ok}}],
       {?eh,test_stats,{7,2,{0,1}}},
       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_init,[]},
 		     {failed,{error,fails_on_purpose}}}},
@@ -289,8 +287,7 @@ test_events(repeat_seq) ->
 		      {init_per_group,gr_fail_result,[]},ok}},
 	{?eh,test_stats,{4,2,{0,2}}},
 	{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_fail_result,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_fail_result,[]},ok}}],
        {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_2,repeat_seq_2},
 			  {group_result,gr_fail_result,failed}}},
        {?eh,test_stats,{4,2,{0,3}}},
@@ -402,8 +399,7 @@ test_events(repeat_gr_until_any_ok) ->
        [{?eh,tc_done,{repeat_1_SUITE,
 		      {init_per_group,gr_fail_result,[]},ok}},
 	{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_fail_result,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_fail_result,[]},ok}}],
        {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,
 		     {failed,{error,{{badmatch,2},'_'}}}}},
        {?eh,test_stats,{1,1,{0,0}}},
@@ -418,8 +414,7 @@ test_events(repeat_gr_until_any_ok) ->
        [{?eh,tc_done,{repeat_1_SUITE,
 		      {init_per_group,gr_fail_result_then_ok,[]},ok}},
 	{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_fail_result_then_ok,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_fail_result_then_ok,[]},ok}}],
        {?eh,tc_done,{repeat_1_SUITE,
 		     {end_per_group,repeat_gr_until_any_ok_1,
 		      [{repeat_until_any_ok,3}]},ok}}],
@@ -441,8 +436,7 @@ test_events(repeat_gr_until_any_ok) ->
 		     {init_per_group,repeat_gr_until_any_ok_2,
 		      [{repeat_until_any_ok,3}]},ok}},
        [{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_fail_result,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_fail_result,[]},ok}}],
        {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,
 		     {failed,{error,{{badmatch,2},'_'}}}}},
        {?eh,test_stats,{5,5,{0,2}}},
@@ -675,8 +669,7 @@ test_events(repeat_gr_until_any_fail) ->
           {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_result,[]}}},
       {?eh,tc_done,
           {repeat_1_SUITE,
-              {end_per_group,gr_ok_then_fail_result,[]},
-              {return_group_result,failed}}}],
+              {end_per_group,gr_ok_then_fail_result,[]},ok}}],
      {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
      {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
      {?eh,test_stats,{8,0,{0,0}}},
@@ -938,8 +931,7 @@ test_events(repeat_gr_until_all_ok) ->
 	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
 	{?eh,test_stats,{3,1,{0,0}}},
 	{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_fail_result_then_ok,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_fail_result_then_ok,[]},ok}}],
        {?eh,tc_done,{repeat_1_SUITE,
 		     {end_per_group,repeat_gr_until_all_ok_1,
 		      [{repeat_until_all_ok,3}]},ok}}],
@@ -1113,8 +1105,7 @@ test_events(repeat_gr_until_all_fail) ->
 				      gr_ok_then_fail_result,[]},ok}},
 	{?eh,test_stats,{3,3,{0,2}}},
 	{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_ok_then_fail_result,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_ok_then_fail_result,[]},ok}}],
        {?eh,tc_done,{repeat_1_SUITE,
 		     {end_per_group,repeat_gr_until_all_fail_1,
 		      [{repeat_until_all_fail,2}]},ok}}],
@@ -1148,8 +1139,7 @@ test_events(repeat_gr_until_all_fail) ->
 		     {init_per_group,repeat_gr_until_all_fail_3,
 		      [{repeat_until_all_fail,3}]},ok}},
        [{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_fail_result,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_fail_result,[]},ok}}],
        {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
        {?eh,test_stats,{6,5,{0,3}}},
        {?eh,tc_done,{repeat_1_SUITE,
@@ -1159,8 +1149,7 @@ test_events(repeat_gr_until_all_fail) ->
 		     {init_per_group,repeat_gr_until_all_fail_3,
 		      [{repeat_until_all_fail,2}]},ok}},
        [{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_fail_result,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_fail_result,[]},ok}}],
        {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
 		     {failed,{error,failing_this_time}}}},
        {?eh,test_stats,{7,6,{0,3}}},
@@ -1263,8 +1252,7 @@ test_events(repeat_seq_until_any_fail) ->
 		     {init_per_group,repeat_seq_until_any_fail_4,
 		      [{repeat_until_any_fail,2},sequence]},ok}},
        [{?eh,tc_done,{repeat_1_SUITE,
-		      {end_per_group,gr_ok_then_fail_result,[]},
-		      {return_group_result,failed}}}],
+		      {end_per_group,gr_ok_then_fail_result,[]},ok}}],
        {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,gr_ok_1},
 			  {group_result,gr_ok_then_fail_result,failed}}},
        {?eh,test_stats,{19,1,{0,3}}},
@@ -1473,8 +1461,7 @@ test_events(repeat_shuffled_seq_until_any_fail) ->
 	[{?eh,tc_start,{repeat_1_SUITE,
 			{end_per_group,gr_ok_then_fail_result,[]}}},
 	 {?eh,tc_done,{repeat_1_SUITE,
-		       {end_per_group,gr_ok_then_fail_result,[]},
-		       {return_group_result,failed}}}],
+		       {end_per_group,gr_ok_then_fail_result,[]},ok}}],
 	{?eh,tc_start,{repeat_1_SUITE,
 		       {end_per_group,repeat_shuffled_seq_until_any_fail_4,
 			[{shuffle,repeated},{repeat_until_any_fail,2},sequence]}}},
diff --git a/lib/common_test/test/ct_sequence_1_SUITE.erl b/lib/common_test/test/ct_sequence_1_SUITE.erl
index 5a775a1117..4055cd789e 100644
--- a/lib/common_test/test/ct_sequence_1_SUITE.erl
+++ b/lib/common_test/test/ct_sequence_1_SUITE.erl
@@ -182,8 +182,7 @@ test_events(subgroup_return_fail) ->
        {?eh,test_stats,{0,1,{0,0}}},
        {?eh,tc_start,
 	{subgroups_1_SUITE,{end_per_group,return_fail,[]}}},
-       {?eh,tc_done,{subgroups_1_SUITE,{end_per_group,return_fail,[]},
-		     {return_group_result,failed}}}],
+       {?eh,tc_done,{subgroups_1_SUITE,{end_per_group,return_fail,[]},ok}}],
       {?eh,tc_auto_skip,
        {subgroups_1_SUITE,{ok_tc,ok_group},
 	{group_result,return_fail,failed}}},
@@ -191,8 +190,7 @@ test_events(subgroup_return_fail) ->
       {?eh,tc_start,
        {subgroups_1_SUITE,{end_per_group,subgroup_return_fail,[sequence]}}},
       {?eh,tc_done,
-       {subgroups_1_SUITE,{end_per_group,subgroup_return_fail,[sequence]},
-	{return_group_result,failed}}}],
+       {subgroups_1_SUITE,{end_per_group,subgroup_return_fail,[sequence]},ok}}],
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -221,8 +219,7 @@ test_events(subgroup_init_fail) ->
       {?eh,test_stats,{0,0,{0,2}}},
       {?eh,tc_start,{subgroups_1_SUITE,{end_per_group,subgroup_init_fail,[sequence]}}},
       {?eh,tc_done,{subgroups_1_SUITE,
-		    {end_per_group,subgroup_init_fail,[sequence]},
-		    {return_group_result,failed}}}],
+		    {end_per_group,subgroup_init_fail,[sequence]},ok}}],
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -245,8 +242,7 @@ test_events(subgroup_after_failed_case) ->
       {?eh,tc_start,{subgroups_1_SUITE,
 		     {end_per_group,subgroup_after_failed_case,[sequence]}}},
       {?eh,tc_done,{subgroups_1_SUITE,
-		    {end_per_group,subgroup_after_failed_case,[sequence]},
-		    {return_group_result,failed}}}],
+		    {end_per_group,subgroup_after_failed_case,[sequence]},ok}}],
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
 ];
@@ -266,16 +262,14 @@ test_events(case_after_subgroup_return_fail) ->
        {?eh,tc_done,{subgroups_1_SUITE,failing_tc,{failed,{error,{{badmatch,3},'_'}}}}},
        {?eh,test_stats,{0,1,{0,0}}},
        {?eh,tc_start,{subgroups_1_SUITE,{end_per_group,return_fail,[]}}},
-       {?eh,tc_done,{subgroups_1_SUITE,{end_per_group,return_fail,[]},
-		     {return_group_result,failed}}}],
+       {?eh,tc_done,{subgroups_1_SUITE,{end_per_group,return_fail,[]},ok}}],
       {?eh,tc_auto_skip,{subgroups_1_SUITE,{ok_tc,case_after_subgroup_return_fail},
 			 {group_result,return_fail,failed}}},
       {?eh,test_stats,{0,1,{0,1}}},
       {?eh,tc_start,{subgroups_1_SUITE,
 		     {end_per_group,case_after_subgroup_return_fail,[sequence]}}},
       {?eh,tc_done,{subgroups_1_SUITE,
-		    {end_per_group,case_after_subgroup_return_fail,[sequence]},
-		    {return_group_result,failed}}}],
+		    {end_per_group,case_after_subgroup_return_fail,[sequence]},ok}}],
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -310,8 +304,7 @@ test_events(case_after_subgroup_fail_init) ->
       {?eh,tc_start,{subgroups_1_SUITE,
 		     {end_per_group,case_after_subgroup_fail_init,[sequence]}}},
       {?eh,tc_done,{subgroups_1_SUITE,
-		    {end_per_group,case_after_subgroup_fail_init,[sequence]},
-		    {return_group_result,failed}}}],
+		    {end_per_group,case_after_subgroup_fail_init,[sequence]},ok}}],
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ].
diff --git a/lib/common_test/test/ct_smoke_test_SUITE.erl b/lib/common_test/test/ct_smoke_test_SUITE.erl
index 49b38361e2..6077946c33 100644
--- a/lib/common_test/test/ct_smoke_test_SUITE.erl
+++ b/lib/common_test/test/ct_smoke_test_SUITE.erl
@@ -480,7 +480,7 @@ events(Test) when Test == dir1 ; Test == dir2 ;
       {Suite,tc4,{skipped,"Skipping this one"}}},
      {?eh,test_stats,{7,0,{1,0}}},
      {?eh,tc_start,{Suite,end_per_suite}},
-     {?eh,tc_done,{Suite,end_per_suite,ips_data}},
+     {?eh,tc_done,{Suite,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -517,7 +517,7 @@ events(Test) when Test == dir1_2 ; Test == suite11_21 ->
       {happy_11_SUITE,tc4,{skipped,"Skipping this one"}}},
      {?eh,test_stats,{7,0,{1,0}}},
      {?eh,tc_start,{happy_11_SUITE,end_per_suite}},
-     {?eh,tc_done,{happy_11_SUITE,end_per_suite,ips_data}},
+     {?eh,tc_done,{happy_11_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{happy_21_SUITE,init_per_suite}},
      {?eh,tc_done,{happy_21_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{happy_21_SUITE,tc1}},
@@ -546,7 +546,7 @@ events(Test) when Test == dir1_2 ; Test == suite11_21 ->
       {happy_21_SUITE,tc4,{skipped,"Skipping this one"}}},
      {?eh,test_stats,{14,0,{2,0}}},
      {?eh,tc_start,{happy_21_SUITE,end_per_suite}},
-     {?eh,tc_done,{happy_21_SUITE,end_per_suite,ips_data}},
+     {?eh,tc_done,{happy_21_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -563,7 +563,7 @@ events(Test) when Test == tc111 ; Test == tc211 ->
      {?eh,tc_done,{Suite,tc1,ok}},
      {?eh,test_stats,{1,0,{0,0}}},
      {?eh,tc_start,{Suite,end_per_suite}},
-     {?eh,tc_done,{Suite,end_per_suite,ips_data}},
+     {?eh,tc_done,{Suite,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -582,7 +582,7 @@ events(tc111_112) ->
      {?eh,tc_done,{happy_11_SUITE,tc2,ok}},
      {?eh,test_stats,{2,0,{0,0}}},
      {?eh,tc_start,{happy_11_SUITE,end_per_suite}},
-     {?eh,tc_done,{happy_11_SUITE,end_per_suite,ips_data}},
+     {?eh,tc_done,{happy_11_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ].
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl
index c2670316b6..bc19283a47 100644
--- a/lib/common_test/test/ct_testspec_1_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_1_SUITE.erl
@@ -795,7 +795,7 @@ test_events(skip_all_groups) ->
      {?eh,test_stats,{0,0,{12,0}}},
      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_4},"SKIPPED!"}},
      {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,ok}},
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
 
@@ -840,7 +840,7 @@ test_events(skip_group) ->
       {?eh,test_stats,{2,0,{6,0}}},
       {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_2},
 			 "SKIPPED!"}},
-      {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
+      {?eh,tc_done,{groups_11_SUITE,end_per_suite,ok}},
       {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
      ];
 
@@ -876,7 +876,7 @@ test_events(skip_group_all_testcases) ->
      {?eh,test_stats,{0,0,{4,0}}},
      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1b},
 			"SKIPPED!"}},
-     {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,ok}},
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
 
@@ -1065,7 +1065,7 @@ test_events(skip_subgroup) ->
       {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_4,[]},ok}}],
 
      {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
-     {?eh,tc_done,{groups_12_SUITE,end_per_suite,init}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,ok}},
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
 
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 1011791899..8d91778cbb 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -720,7 +720,7 @@ handle_tc_exit(Reason, #st{status=tc,config=Config0,mf={Mod,Func},pid=Pid}=St)
 			 Msg = {E,AbortReason},
 			 {Msg,Loc0,Msg};
 		     Other ->
-			 {Other,unknown,Other}
+			 {{'EXIT',Other},unknown,Other}
 		 end,
     Timeout = end_conf_timeout(Reason, St),
     Config = [{tc_status,{failed,F}}|Config0],
@@ -734,7 +734,7 @@ handle_tc_exit(Reason, #st{config=Config,mf={Mod,Func0},pid=Pid,
 		   {testcase_aborted=E,AbortReason,Loc0} ->
 		       {{E,AbortReason},Loc0};
 		   Other ->
-		       {Other,St#st.last_known_loc}
+		       {{'EXIT',Other},St#st.last_known_loc}
 	       end,
     Func = case Status of
 	       init_per_testcase=F -> {F,Func0};
@@ -771,18 +771,16 @@ do_call_end_conf(Starter,Mod,Func,Data,Conf,TVal) ->
 		EndConfApply =
 		    fun() ->
 			    timetrap(TVal),
-			    case catch apply(Mod,
-					     end_per_testcase,
-					     [Func,Conf]) of
-				{'EXIT',Why} ->
+			    try apply(Mod,end_per_testcase,[Func,Conf]) of
+				_ -> ok
+			    catch
+				_:Why ->
 				    timer:sleep(1),
 				    group_leader() ! {printout,12,
 						      "WARNING! "
 						      "~w:end_per_testcase(~w, ~p)"
 						      " crashed!\n\tReason: ~p\n",
-						      [Mod,Func,Conf,Why]};
-				_ ->
-				    ok
+						      [Mod,Func,Conf,Why]}
 			    end,
 			    Supervisor ! {self(),end_conf}
 		    end,
@@ -811,13 +809,11 @@ spawn_fw_call(Mod,{init_per_testcase,Func},CurrConf,Pid,
 		Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
 		%% if init_per_testcase fails, the test case
 		%% should be skipped
-		case catch do_end_tc_call(Mod,Func,
-					  {Pid,Skip,[CurrConf]},
-					  Why) of
-		    {'EXIT',FwEndTCErr} ->
-			exit({fw_notify_done,end_tc,FwEndTCErr});
-		    _ ->
-			ok
+		try do_end_tc_call(Mod,Func, {Pid,Skip,[CurrConf]}, Why) of
+		    _ -> ok
+		catch
+		    _:FwEndTCErr ->
+			exit({fw_notify_done,end_tc,FwEndTCErr})
 		end,
 		%% finished, report back
 		SendTo ! {self(),fw_notify_done,
@@ -845,12 +841,12 @@ spawn_fw_call(Mod,{end_per_testcase,Func},EndConf,Pid,
 				  " failed!\n\tReason: timetrap timeout"
 				  " after ~w ms!\n", [Mod,Func,EndConf,TVal]},
 		FailLoc = proplists:get_value(tc_fail_loc, EndConf),
-		case catch do_end_tc_call(Mod,Func,
+		try do_end_tc_call(Mod,Func,
 					  {Pid,Report,[EndConf]}, Why) of
-		    {'EXIT',FwEndTCErr} ->
-			exit({fw_notify_done,end_tc,FwEndTCErr});
-		    _ ->
-			ok
+		    _ -> ok
+		catch
+		    _:FwEndTCErr ->
+			exit({fw_notify_done,end_tc,FwEndTCErr})
 		end,
 		Warn = "<font color=\"red\">"
 		       "WARNING: end_per_testcase timed out!</font>",
@@ -886,21 +882,21 @@ spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
 	    end,
     FwCall =
 	fun() ->
-		case catch fw_error_notify(Mod,Func1,[],
-					   Error,Loc) of
-		    {'EXIT',FwErrorNotifyErr} ->
+		try fw_error_notify(Mod,Func1,[],
+				    Error,Loc) of
+		    _ -> ok
+		catch
+		    _:FwErrorNotifyErr ->
 			exit({fw_notify_done,error_notification,
-			      FwErrorNotifyErr});
-		    _ ->
-			ok
+			      FwErrorNotifyErr})
 		end,
 		Conf = [{tc_status,{failed,Error}}|CurrConf],
-		case catch do_end_tc_call(Mod,Func1,
-					  {Pid,Error,[Conf]},Error) of
-		    {'EXIT',FwEndTCErr} ->
-			exit({fw_notify_done,end_tc,FwEndTCErr});
-		    _ ->
-			ok
+		try do_end_tc_call(Mod,Func1,
+				   {Pid,Error,[Conf]},Error) of
+		    _ -> ok
+		catch
+		    _:FwEndTCErr ->
+			exit({fw_notify_done,end_tc,FwEndTCErr})
 		end,
 		%% finished, report back
 		SendTo ! {self(),fw_notify_done,{died,Error,Loc,[],undefined}}