Fix problems with info functions and add more tests

4 files changed, 208 insertions, 110 deletions

diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 670c073b29..2de75f0845 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -167,6 +167,10 @@ init_tc1(Mod,Suite,Func,[Config0]) when is_list(Config0) ->
 				   data={Mod,FuncSpec}}),
 	    ct_util:set_testdata({curr_tc,{Suite,Error}}),
 	    {error,Error};
+	Error = {group0_failed,_} ->
+	    {auto_skip,Error};
+	Error = {testcase0_failed,_} ->
+	    {auto_skip,Error};
 	{SuiteInfo,MergeResult} ->
 	    case MergeResult of
 		{error,Reason} ->
@@ -272,6 +276,8 @@ add_defaults(Mod,Func, GroupPath) ->
 	    SuiteInfo = merge_with_suite_defaults(Suite,[]),
 	    SuiteInfoNoCTH = [I || I <- SuiteInfo, element(1,I) =/= ct_hooks],
 	    case add_defaults1(Mod,Func, GroupPath, SuiteInfoNoCTH) of
+		Error = {group0_failed,_} -> Error;
+		Error = {testcase0_failed,_} -> Error;
 		Error = {error,_} -> {SuiteInfo,Error};
 		MergedInfo -> {SuiteInfo,MergedInfo}
 	    end;
@@ -292,13 +298,16 @@ add_defaults(Mod,Func, GroupPath) ->
 					   element(1,I) =/= ct_hooks],
 		    case add_defaults1(Mod,Func, GroupPath,
 				       SuiteInfoNoCTH) of
+			Error = {group0_failed,_} -> Error;
+			Error = {testcase0_failed,_} -> Error;
 			Error = {error,_} -> {SuiteInfo1,Error};
 			MergedInfo -> {SuiteInfo1,MergedInfo}
 		    end;
 		false ->
 		    ErrStr = io_lib:format("~n*** ERROR *** "
 					   "Invalid return value from "
-					   "~w:suite/0: ~p~n", [Suite,SuiteInfo]),
+					   "~w:suite/0: ~p~n",
+					   [Suite,SuiteInfo]),
 		    io:format(ErrStr, []),
 		    io:format(user, ErrStr, []),
 		    {suite0_failed,bad_return_value}
@@ -318,36 +327,69 @@ add_defaults1(Mod,Func, GroupPath, SuiteInfo) ->
     %%     [LevelXGroupInfo, LevelX-1GroupInfo, ..., TopLevelGroupInfo]
     GroupPathInfo =  
 	lists:map(fun(GroupProps) ->
-			  Name = ?val(name, GroupProps),
-			  case catch Suite:group(Name) of
-			      GrInfo when is_list(GrInfo) -> GrInfo;
-			      _ -> []
+			  case ?val(name, GroupProps) of
+			      undefined ->
+				  [];
+			      Name ->
+				  case catch Suite:group(Name) of
+				      GrInfo when is_list(GrInfo) -> GrInfo;
+				      {'EXIT',{undef,_}} -> [];
+				      BadGr0 -> {error,BadGr0,Name}
+				  end
 			  end
 		  end, GroupPath),
-    Args = if Func == init_per_group ; Func == end_per_group ->
-		   [?val(name, hd(GroupPath))];
-	      true ->
-		   []
-	   end,
-    TestCaseInfo =
-	case catch apply(Mod,Func,Args) of
-	    TCInfo when is_list(TCInfo) -> TCInfo;
-	    _ -> []
-	end,
-    %% let test case info (also for all config funcs) override group info,
-    %% and lower level group info override higher level info
-    TCAndGroupInfo = [TestCaseInfo | remove_info_in_prev(TestCaseInfo,
-							 GroupPathInfo)],
-    %% find and save require terms found in suite info
-    SuiteReqs = 
-	[SDDef || SDDef <- SuiteInfo,
-		  ((require == element(1,SDDef)) or
-		   (default_config == element(1,SDDef)))],
-    case check_for_clashes(TestCaseInfo, GroupPathInfo, SuiteReqs) of
-	[] ->
-	    add_defaults2(Mod,Func, TCAndGroupInfo,SuiteInfo,SuiteReqs);
-	Clashes ->
-	    {error,{config_name_already_in_use,Clashes}}
+    case lists:keysearch(error, 1, GroupPathInfo) of
+	{value,{error,BadGr0Val,GrName}} ->
+	    Gr0ErrStr = io_lib:format("~n*** ERROR *** "
+				      "Invalid return value from "
+				      "~w:group(~w): ~p~n",
+				      [Mod,GrName,BadGr0Val]),
+	    io:format(Gr0ErrStr, []),
+	    io:format(user, Gr0ErrStr, []),
+	    {group0_failed,bad_return_value};
+	_ ->
+	    Args = if Func == init_per_group ; Func == end_per_group ->
+			   [?val(name, hd(GroupPath))];
+		      true ->
+			   []
+		   end,
+	    TestCaseInfo =
+		case catch apply(Mod,Func,Args) of
+		    TCInfo when is_list(TCInfo) -> TCInfo;
+		    {'EXIT',{undef,_}} -> [];
+		    BadTC0 -> {error,BadTC0}
+		end,
+	    
+	    case TestCaseInfo of
+		{error,BadTC0Val} ->
+		    TC0ErrStr = io_lib:format("~n*** ERROR *** "
+					      "Invalid return value from "
+					      "~w:~w/0: ~p~n",
+					      [Mod,Func,BadTC0Val]),
+		    io:format(TC0ErrStr, []),
+		    io:format(user, TC0ErrStr, []),
+		    {testcase0_failed,bad_return_value};
+		_ ->
+		    %% let test case info (also for all config funcs) override
+		    %% group info, and lower level group info override higher
+		    %% level info
+		    TCAndGroupInfo =
+			[TestCaseInfo | remove_info_in_prev(TestCaseInfo,
+							    GroupPathInfo)],
+		    %% find and save require terms found in suite info
+		    SuiteReqs = 
+			[SDDef || SDDef <- SuiteInfo,
+				  ((require == element(1,SDDef))
+				   or (default_config == element(1,SDDef)))],
+		    case check_for_clashes(TestCaseInfo, GroupPathInfo,
+					   SuiteReqs) of
+			[] ->
+			    add_defaults2(Mod,Func, TCAndGroupInfo,
+					  SuiteInfo,SuiteReqs);
+			Clashes ->
+			    {error,{config_name_already_in_use,Clashes}}
+		    end
+	    end
     end.
 
 get_suite_name(?MODULE, [Cfg|_]) when is_list(Cfg), Cfg /= [] ->
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 1a6e4d31a8..a7fb45a4e4 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -1249,7 +1249,8 @@ make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
 		 integer_to_list(NotBuilt),"</a></td>\n"]
 	end,
     FailStr =
-	if Fail > 0 ->  
+	if (Fail > 0) or (NotBuilt > 0) or
+	   ((Success+Fail+UserSkip+AutoSkip) == 0) ->  
 		["<font color=\"red\">",
 		 integer_to_list(Fail),"</font>"];
 	   true ->
@@ -1904,7 +1905,8 @@ runentry(Dir, undefined, _) ->
 runentry(Dir, Totals={Node,Label,Logs,
 		      {TotSucc,TotFail,UserSkip,AutoSkip,NotBuilt}}, Index) ->
     TotFailStr =
-	if TotFail > 0 ->  
+	if (TotFail > 0) or (NotBuilt > 0) or
+	   ((TotSucc+TotFail+UserSkip+AutoSkip) == 0) ->
 		["<font color=\"red\">",
 		 integer_to_list(TotFail),"</font>"];
 	   true ->
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
index 64957a76c9..c4b3191801 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
@@ -65,12 +65,12 @@ groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
+
 
-     
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -104,7 +104,7 @@ ts_if_1(Config) when is_list(Config) ->
 
     TestEvents = events_to_check(ts_if_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
-        
+
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
@@ -112,17 +112,17 @@ ts_if_1(Config) when is_list(Config) ->
 
 setup(Test, Config) ->
     Opts0 = ct_test_support:get_opts(Config),
-%    Level = ?config(trace_level, Config),
-%    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
-%    Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}}],
+						%    Level = ?config(trace_level, Config),
+						%    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+						%    Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}}],
     Opts = [Test | Opts0],
     ERPid = ct_test_support:start_event_receiver(Config),
     {Opts,ERPid}.
 
 reformat(Events, EH) ->
     ct_test_support:reformat(Events, EH).
-%reformat(Events, _EH) ->
-%    Events.
+						%reformat(Events, _EH) ->
+						%    Events.
 
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
@@ -140,14 +140,15 @@ test_events(ts_if_1) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{10,6,26}},
+     {?eh,start_info,{10,8,25}},
+
      {?eh,tc_start,{ts_if_1_SUITE,init_per_suite}},
      {?eh,tc_done,{ts_if_1_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{ts_if_1_SUITE,tc1}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc1,{auto_skipped,
-				      {failed,
-				       {ts_if_1_SUITE,init_per_testcase,
-					{timetrap_timeout,2000}}}}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc1,
+		   {auto_skipped,
+		    {failed,
+		     {ts_if_1_SUITE,init_per_testcase,{timetrap_timeout,2000}}}}}},
      {?eh,test_stats,{0,0,{0,1}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc2}},
      {?eh,tc_done,{ts_if_1_SUITE,tc2,
@@ -173,107 +174,148 @@ test_events(ts_if_1) ->
       {?eh,tc_done,{ts_if_1_SUITE,{end_per_group,seq2,[sequence]},ok}}],
 
      {?eh,tc_start,{ts_if_1_SUITE,tc6}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc6,{auto_skipped,
-				      {require_failed,{not_available,void}}}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc6,{auto_skipped,{require_failed,
+						    {not_available,void}}}}},
      {?eh,test_stats,{1,3,{0,4}}},
-     {?eh,tc_start,{ts_if_1_SUITE,tc7}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc7,ok}},
-     {?eh,test_stats,{2,3,{0,4}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc7,{auto_skipped,
+				      {testcase0_failed,bad_return_value}}}},
+     {?eh,test_stats,{1,3,{0,5}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc8}},
      {?eh,tc_done,{ts_if_1_SUITE,tc8,{skipped,"tc8 skipped"}}},
-     {?eh,test_stats,{2,3,{1,4}}},
+     {?eh,test_stats,{1,3,{1,5}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc9}},
      {?eh,tc_done,{ts_if_1_SUITE,tc9,{skipped,'tc9 skipped'}}},
-     {?eh,test_stats,{2,3,{2,4}}},
+     {?eh,test_stats,{1,3,{2,5}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc10}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc10,{failed,{error,{function_clause,'_'}}}}},
-     {?eh,test_stats,{2,4,{2,4}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc10,
+		   {failed,{error,{function_clause,'_'}}}}},
+     {?eh,test_stats,{1,4,{2,5}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc11}},
      {?eh,tc_done,{ts_if_1_SUITE,tc11,
-		   {auto_skipped,{failed,{ts_if_1_SUITE,init_per_testcase,bad_return}}}}},
-     {?eh,test_stats,{2,4,{2,5}}},
+		   {auto_skipped,
+		    {failed,{ts_if_1_SUITE,init_per_testcase,bad_return}}}}},
+     {?eh,test_stats,{1,4,{2,6}}},
 
      [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,g1,[]}}},
       {?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g1,[]},
 		    {skipped,g1_got_skipped}}},
       {?eh,tc_user_skip,{ts_if_1_SUITE,gtc1,g1_got_skipped}},
-      {?eh,test_stats,{2,4,{3,5}}},
+      {?eh,test_stats,{1,4,{3,6}}},
       {?eh,tc_user_skip,{ts_if_1_SUITE,end_per_group,g1_got_skipped}}],
-
+     
      {parallel,
       [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,g2,[parallel]}}},
        {?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g2,[parallel]},ok}},
        [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,g3,[]}}},
-	{?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g3,[]},
-		      {skipped,g3_got_skipped}}},
-	{?eh,tc_user_skip,{ts_if_1_SUITE,gtc2,g3_got_skipped}},
-	{?eh,test_stats,{2,4,{4,5}}},
-	{?eh,tc_user_skip,{ts_if_1_SUITE,end_per_group,g3_got_skipped}}],
+    	{?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g3,[]},{skipped,g3_got_skipped}}},
+    	{?eh,tc_user_skip,{ts_if_1_SUITE,gtc2,g3_got_skipped}},
+    	{?eh,test_stats,{1,4,{4,6}}},
+    	{?eh,tc_user_skip,{ts_if_1_SUITE,end_per_group,g3_got_skipped}}],
        {?eh,tc_start,{ts_if_1_SUITE,{end_per_group,g2,[parallel]}}},
        {?eh,tc_done,{ts_if_1_SUITE,{end_per_group,g2,[parallel]},ok}}]},
 
      {?eh,tc_start,{ts_if_1_SUITE,tc12}},
      {?eh,tc_done,{ts_if_1_SUITE,tc12,{failed,{testcase_aborted,'stopping tc12'}}}},
-     {?eh,test_stats,{2,5,{4,5}}},
+     {?eh,test_stats,{1,5,{4,6}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc13}},
      {?eh,tc_done,{ts_if_1_SUITE,tc13,ok}},
-     {?eh,test_stats,{3,5,{4,5}}},
+     {?eh,test_stats,{2,5,{4,6}}},
      {?eh,tc_start,{ts_if_1_SUITE,end_per_suite}},
      {?eh,tc_done,{ts_if_1_SUITE,end_per_suite,ok}},
 
+
      {?eh,tc_start,{ts_if_2_SUITE,init_per_suite}},
-     {?eh,tc_done,{ts_if_2_SUITE,init_per_suite,
-		   {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
-     {?eh,tc_auto_skip,{ts_if_2_SUITE,my_test_case,
-			{failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
-     {?eh,test_stats,{3,5,{4,6}}},
-     {?eh,tc_auto_skip,{ts_if_2_SUITE,end_per_suite,
-			{failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
+     {?eh,tc_done,
+      {ts_if_2_SUITE,init_per_suite,
+       {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
+     {?eh,tc_auto_skip,
+      {ts_if_2_SUITE,my_test_case,
+       {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
+     {?eh,test_stats,{2,5,{4,7}}},
+     {?eh,tc_auto_skip,
+      {ts_if_2_SUITE,end_per_suite,
+       {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
+
 
      {?eh,tc_start,{ct_framework,error_in_suite}},
-     {?eh,test_stats,{3,6,{4,6}}},
+     {?eh,test_stats,{2,6,{4,7}}},
+
 
      {?eh,tc_start,{ct_framework,error_in_suite}},
-     {?eh,test_stats,{3,7,{4,6}}},
+     {?eh,test_stats,{2,7,{4,7}}},
+
 
      {?eh,tc_start,{ts_if_5_SUITE,init_per_suite}},
      {?eh,tc_done,{ts_if_5_SUITE,init_per_suite,
-		   {auto_skipped,{require_failed_in_suite0,
-				  {not_available,undef_variable}}}}},
-     {?eh,tc_auto_skip,{ts_if_5_SUITE,my_test_case,
-			{require_failed_in_suite0,{not_available,undef_variable}}}},
-     {?eh,test_stats,{3,7,{4,7}}},
-     {?eh,tc_auto_skip,{ts_if_5_SUITE,end_per_suite,
-			{require_failed_in_suite0,{not_available,undef_variable}}}},
+		   {auto_skipped,
+		    {require_failed_in_suite0,{not_available,undef_variable}}}}},
+     {?eh,tc_auto_skip,
+      {ts_if_5_SUITE,my_test_case,
+       {require_failed_in_suite0,{not_available,undef_variable}}}},
+     {?eh,test_stats,{2,7,{4,8}}},
+     {?eh,tc_auto_skip,
+      {ts_if_5_SUITE,end_per_suite,
+       {require_failed_in_suite0,{not_available,undef_variable}}}},
 
+     
      {?eh,tc_start,{ct_framework,init_per_suite}},
      {?eh,tc_done,{ct_framework,init_per_suite,
 		   {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
-     {?eh,tc_auto_skip,{ts_if_6_SUITE,tc1,
-			{failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
-     {?eh,test_stats,{3,7,{4,8}}},
-     {?eh,tc_auto_skip,{ct_framework,end_per_suite,
-			{failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
-
-     {?eh,tc_start,{ts_if_7_SUITE,tc1}},
-     {?eh,tc_done,{ts_if_7_SUITE,tc1,ok}},
-     {?eh,test_stats,{4,7,{4,8}}},
-
-     {?eh,tc_start,{ts_if_8_SUITE,tc1}},
-     {?eh,tc_done,{ts_if_8_SUITE,tc1,{failed,{error,failed_on_purpose}}}},
-     {?eh,test_stats,{4,8,{4,8}}},
-
-     {?eh,tc_user_skip,{skipped_by_spec_1_SUITE,all,"should be skipped"}},
-     {?eh,test_stats,{4,8,{5,8}}},
-
-     {?eh,tc_start,{skipped_by_spec_2_SUITE,init_per_suite}},
-     {?eh,tc_done,{skipped_by_spec_2_SUITE,init_per_suite,ok}},
-     {?eh,tc_user_skip,{skipped_by_spec_2_SUITE,tc1,"should be skipped"}},
-     {?eh,test_stats,{4,8,{6,8}}},
-     {?eh,tc_start,{skipped_by_spec_2_SUITE,end_per_suite}},
-     {?eh,tc_done,{skipped_by_spec_2_SUITE,end_per_suite,ok}},
-
-     {?eh,test_done,{'DEF','STOP_TIME'}},
-     {?eh,stop_logging,[]}
-    ].
+     {?eh,tc_auto_skip,
+      {ts_if_6_SUITE,tc1,
+       {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
+     {?eh,test_stats,{2,7,{4,9}}},
+     {?eh,tc_auto_skip,
+      {ct_framework,end_per_suite,
+       {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
+
+
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,tc_done,{ct_framework,init_per_suite,ok}},
+     {?eh,tc_done,
+      {ts_if_7_SUITE,tc1,{auto_skipped,{testcase0_failed,bad_return_value}}}},
+     {?eh,test_stats,{2,7,{4,10}}},
+     {?eh,tc_done,{ts_if_7_SUITE,
+		   {init_per_group,g1,[]},
+		   {auto_skipped,{group0_failed,bad_return_value}}}},
+     {?eh,tc_auto_skip,
+      {ts_if_7_SUITE,tc2,{group0_failed,bad_return_value}}},
+     {?eh,test_stats,{2,7,{4,11}}},
+     {?eh,tc_auto_skip,
+      {ts_if_7_SUITE,end_per_group,{group0_failed,bad_return_value}}}],
+
+    [{?eh,tc_start,{ts_if_7_SUITE,{init_per_group,g2,[]}}},
+     {?eh,tc_done,{ts_if_7_SUITE,{init_per_group,g2,[]},ok}},
+     {?eh,tc_done,{ts_if_7_SUITE,tc2,
+		   {auto_skipped,{testcase0_failed,bad_return_value}}}},
+     {?eh,test_stats,{2,7,{4,12}}},
+     {?eh,tc_start,{ts_if_7_SUITE,{end_per_group,g2,[]}}},
+     {?eh,tc_done,{ts_if_7_SUITE,{end_per_group,g2,[]},ok}}],
+
+    {?eh,tc_start,{ct_framework,end_per_suite}},
+    {?eh,tc_done,{ct_framework,end_per_suite,ok}},
+
+    
+    {?eh,tc_start,{ct_framework,init_per_suite}},
+    {?eh,tc_done,{ct_framework,init_per_suite,ok}},
+    {?eh,tc_start,{ts_if_8_SUITE,tc1}},
+    {?eh,tc_done,{ts_if_8_SUITE,tc1,{failed,{error,failed_on_purpose}}}},
+    {?eh,test_stats,{2,8,{4,12}}},
+    {?eh,tc_start,{ct_framework,end_per_suite}},
+    {?eh,tc_done,{ct_framework,end_per_suite,ok}},
+
+    
+    {?eh,tc_user_skip,{skipped_by_spec_1_SUITE,all,"should be skipped"}},
+    {?eh,test_stats,{2,8,{5,12}}},
+    {?eh,tc_start,{skipped_by_spec_2_SUITE,init_per_suite}},
+    {?eh,tc_done,{skipped_by_spec_2_SUITE,init_per_suite,ok}},
+    {?eh,tc_user_skip,{skipped_by_spec_2_SUITE,tc1,"should be skipped"}},
+    {?eh,test_stats,{2,8,{6,12}}},
+    {?eh,tc_start,{skipped_by_spec_2_SUITE,end_per_suite}},
+    {?eh,tc_done,{skipped_by_spec_2_SUITE,end_per_suite,ok}},
+    
+    {?eh,test_done,{'DEF','STOP_TIME'}},
+    {?eh,stop_logging,[]}
+	].
+
 
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_7_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_7_SUITE.erl
index a2254848d0..20e04c464b 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_7_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_7_SUITE.erl
@@ -73,7 +73,8 @@ end_per_testcase(_TestCase, _Config) ->
 %% N = integer() | forever
 %%--------------------------------------------------------------------
 groups() ->
-    [].
+    [{g1,[],[tc2]},
+     {g2,[],[tc2]}].
 
 %%--------------------------------------------------------------------
 %% Function: all() -> GroupsAndTestCases | {skip,Reason}
@@ -83,7 +84,12 @@ groups() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 all() -> 
-    [tc1].
+    [tc1,{group,g1},{group,g2}].
+
+group(g1) ->
+    exit(g1_byebye);
+group(_) ->
+    [].
 
 tc1() ->
     exit(tc1_byebye).
@@ -91,3 +97,9 @@ tc1() ->
 tc1(_) ->
     done.
 
+tc2() ->
+    exit(tc2_byebye).
+
+tc2(_) ->
+    done.
+