1 files changed, 26 insertions, 26 deletions
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 194e7d42ae..ecf231529a 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -369,8 +369,8 @@ test_events(cfg_error) ->
 				      {'EXIT',init_per_suite_fails}}}}},
      {?eh,test_stats,{0,0,{0,1}}},
      {?eh,tc_auto_skip,
-      {cfg_error_1_SUITE,tc2,{failed,{cfg_error_1_SUITE,init_per_suite,
-				      {'EXIT',init_per_suite_fails}}}}},
+      {cfg_error_1_SUITE,{tc2,g1},{failed,{cfg_error_1_SUITE,init_per_suite,
+					   {'EXIT',init_per_suite_fails}}}}},
      {?eh,test_stats,{0,0,{0,2}}},
      {?eh,tc_auto_skip,
       {cfg_error_1_SUITE,end_per_suite,{failed,{cfg_error_1_SUITE,init_per_suite,
@@ -386,7 +386,7 @@ test_events(cfg_error) ->
 		{'EXIT',{{badmatch,[1,2]},'_'}}}}}},
      {?eh,test_stats,{0,0,{0,3}}},
      {?eh,tc_auto_skip,
-      {cfg_error_2_SUITE,tc2,
+      {cfg_error_2_SUITE,{tc2,g1},
        {failed,{cfg_error_2_SUITE,init_per_suite,      
 		{'EXIT',{{badmatch,[1,2]},'_'}}}}}},
      {?eh,test_stats,{0,0,{0,4}}},
@@ -403,7 +403,7 @@ test_events(cfg_error) ->
        {failed,{cfg_error_3_SUITE,init_per_suite,{timetrap_timeout,2000}}}}},
      {?eh,test_stats,{0,0,{0,5}}},
      {?eh,tc_auto_skip,
-      {cfg_error_3_SUITE,tc2,
+      {cfg_error_3_SUITE,{tc2,g1},
        {failed,{cfg_error_3_SUITE,init_per_suite,{timetrap_timeout,2000}}}}},
      {?eh,test_stats,{0,0,{0,6}}},
      {?eh,tc_auto_skip,
@@ -417,7 +417,7 @@ test_events(cfg_error) ->
        {failed,{cfg_error_4_SUITE,init_per_suite,bad_return}}}},
      {?eh,test_stats,{0,0,{0,7}}},
      {?eh,tc_auto_skip,
-      {cfg_error_4_SUITE,tc2,
+      {cfg_error_4_SUITE,{tc2,g1},
        {failed,{cfg_error_4_SUITE,init_per_suite,bad_return}}}},
      {?eh,test_stats,{0,0,{0,8}}},
      {?eh,tc_auto_skip,
@@ -431,7 +431,7 @@ test_events(cfg_error) ->
        {failed,{cfg_error_5_SUITE,init_per_suite,bad_return}}}},
      {?eh,test_stats,{0,0,{0,9}}},
      {?eh,tc_auto_skip,
-      {cfg_error_5_SUITE,tc2,
+      {cfg_error_5_SUITE,{tc2,g1},
        {failed,{cfg_error_5_SUITE,init_per_suite,bad_return}}}},
      {?eh,test_stats,{0,0,{0,10}}},
      {?eh,tc_auto_skip,
@@ -477,7 +477,7 @@ test_events(cfg_error) ->
        {cfg_error_8_SUITE,{init_per_group,g1,[]},
 	{failed,{error,{init_per_group_fails,g1}}}}},
       {?eh,tc_auto_skip,
-       {cfg_error_8_SUITE,tc1,
+       {cfg_error_8_SUITE,{tc1,g1},
 	{failed,{cfg_error_8_SUITE,init_per_group,
 		 {'EXIT',{init_per_group_fails,g1}}}}}},
       {?eh,test_stats,{4,0,{0,11}}},
@@ -489,7 +489,7 @@ test_events(cfg_error) ->
      [{?eh,tc_start,{cfg_error_8_SUITE,{init_per_group,g2,[]}}},
       {?eh,tc_done,{cfg_error_8_SUITE,{init_per_group,g2,[]},
 		    {failed,{timetrap_timeout,2000}}}},
-      {?eh,tc_auto_skip,{cfg_error_8_SUITE,tc1,
+      {?eh,tc_auto_skip,{cfg_error_8_SUITE,{tc1,g2},
 			 {failed,{cfg_error_8_SUITE,init_per_group,
 				  {timetrap_timeout,2000}}}}},
       {?eh,test_stats,{4,0,{0,12}}},
@@ -502,7 +502,7 @@ test_events(cfg_error) ->
        {cfg_error_8_SUITE,{init_per_group,g3,[]},
 	{failed,{error,{{badmatch,42},'_'}}}}},
       {?eh,tc_auto_skip,
-       {cfg_error_8_SUITE,tc1,
+       {cfg_error_8_SUITE,{tc1,g3},
 	{failed,{cfg_error_8_SUITE,init_per_group,
 		 {'EXIT',{{badmatch,42},'_'}}}}}},
       {?eh,test_stats,{4,0,{0,13}}},
@@ -528,7 +528,7 @@ test_events(cfg_error) ->
        {?eh,tc_done,{cfg_error_8_SUITE,{init_per_group,g6,[]},
 		     {failed,{error,{sub_group_failed,g6}}}}},
        {?eh,tc_auto_skip,
-	{cfg_error_8_SUITE,tc2,
+	{cfg_error_8_SUITE,{tc2,g6},
 	 {failed,{cfg_error_8_SUITE,init_per_group,
 		  {'EXIT',{sub_group_failed,g6}}}}}},
        {?eh,test_stats,{6,0,{0,14}}},
@@ -1111,11 +1111,11 @@ test_events(timetrap_fun_group) ->
      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g4,[]}}},
       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g4,[]},
 		    {user_timetrap_error,{kaboom,'_'}}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,g4},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}},
       {?eh,test_stats,{0,11,{0,1}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,g4},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}},
       {?eh,test_stats,{0,11,{0,2}}},
@@ -1126,11 +1126,11 @@ test_events(timetrap_fun_group) ->
      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g5,[]}}},
       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g5,[]},
 		    {user_timetrap_error,{kaboom,'_'}}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,g5},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}},
       {?eh,test_stats,{0,11,{0,3}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,g5},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}},
       {?eh,test_stats,{0,11,{0,4}}},
@@ -1141,11 +1141,11 @@ test_events(timetrap_fun_group) ->
      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g6,[]}}},
       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g6,[]},
 		    {failed,{timetrap_timeout,{'$approx',500}}}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,g6},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {timetrap_timeout,'_'}}}}},
       {?eh,test_stats,{0,11,{0,5}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,g6},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {timetrap_timeout,'_'}}}}},
       {?eh,test_stats,{0,11,{0,6}}},
@@ -1294,11 +1294,11 @@ test_events(timetrap_fun_group) ->
       [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg4,[parallel]}}},
        {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg4,[parallel]},
 		     {user_timetrap_error,{kaboom,'_'}}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,pg4},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}},
        {?eh,test_stats,{4,26,{0,7}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,pg4},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}},
        {?eh,test_stats,{4,26,{0,8}}},
@@ -1310,11 +1310,11 @@ test_events(timetrap_fun_group) ->
       [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg5,[parallel]}}},
        {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg5,[parallel]},
 		     {user_timetrap_error,{kaboom,'_'}}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,pg5},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}},
        {?eh,test_stats,{4,26,{0,9}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,pg5},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}},
        {?eh,test_stats,{4,26,{0,10}}},
@@ -1326,11 +1326,11 @@ test_events(timetrap_fun_group) ->
       [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg6,[parallel]}}},
        {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg6,[parallel]},
 		     {failed,{timetrap_timeout,{'$approx',500}}}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,pg6},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {timetrap_timeout,'_'}}}}},
        {?eh,test_stats,{4,26,{0,11}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,pg6},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {timetrap_timeout,'_'}}}}},
        {?eh,test_stats,{4,26,{0,12}}},
@@ -1407,10 +1407,10 @@ test_events(timetrap_fun_group) ->
       {?eh,tc_done,{timetrap_8_SUITE,tc0,
 		    {user_timetrap_error,{kaboom,'_'}}}},
       {?eh,test_stats,{9,31,{0,12}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc1,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc1,sg1},
 			 {failed,{timetrap_8_SUITE,tc0}}}},
       {?eh,test_stats,{9,31,{0,13}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,sg1},
 			 {failed,{timetrap_8_SUITE,tc0}}}},
       {?eh,test_stats,{9,31,{0,14}}},
        {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,sg1,[sequence]}}},
@@ -1425,10 +1425,10 @@ test_events(timetrap_fun_group) ->
       {?eh,tc_done,{timetrap_8_SUITE,tc0,
 		    {failed,{timetrap_timeout,{'$approx',1000}}}}},
       {?eh,test_stats,{10,32,{0,14}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc1,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc1,sg2},
 			 {failed,{timetrap_8_SUITE,tc0}}}},
       {?eh,test_stats,{10,32,{0,15}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,sg2},
 			 {failed,{timetrap_8_SUITE,tc0}}}},
       {?eh,test_stats,{10,32,{0,16}}},
       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,sg2,[sequence]}}},