Add verification terms to test suite

Work in progress...

2 files changed, 1348 insertions, 20 deletions

diff --git a/lib/common_test/test/ct_repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE.erl
index 558cb731c9..1b4cafc9d3 100644
--- a/lib/common_test/test/ct_repeat_1_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_1_SUITE.erl
@@ -62,12 +62,17 @@ all(doc) ->
 all(suite) ->
     [repeat_cs,
      repeat_cs_and_grs,
-     repeat_seq_1,
-     repeat_seq_2,
+     repeat_seq,
      repeat_cs_until_any_ok,
+     repeat_gr_until_any_ok,
      repeat_cs_until_any_fail,
+     repeat_gr_until_any_fail,
      repeat_cs_until_all_ok,
-     repeat_cs_until_all_fail
+     repeat_gr_until_all_ok,
+     repeat_cs_until_all_fail,
+     repeat_gr_until_all_fail,
+     repeat_seq_until_any_fail,
+     repeat_shuffled_seq_until_any_fail
     ].
 
 %%--------------------------------------------------------------------
@@ -183,25 +188,1350 @@ events_to_check(Test, N) ->
     test_events(Test) ++ events_to_check(Test, N-1).
 
 test_events(repeat_cs) ->
-    [];
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_1,[]},ok}},
+       {?eh,test_stats,{2,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_1,[]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_2,[{repeat,2}]},ok}},
+       {?eh,test_stats,{4,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_2,[{repeat,2}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_2,[]},ok}},
+       {?eh,test_stats,{6,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_2,[]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
 
 test_events(repeat_cs_and_grs) ->
-    [];
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_and_grs,[{repeat,2}]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,{failed,{error,{{badmatch,2},'_'}}}}},
+      {?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,test_stats,{3,1,{0,0}}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_init,[]},
+		     {failed,{error,fails_on_purpose}}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {failed,{repeat_1_SUITE,init_per_group,
+				   {'EXIT',fails_on_purpose}}}}},
+       {?eh,test_stats,{3,1,{0,1}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			  {failed,{repeat_1_SUITE,init_per_group,
+				   {'EXIT',fails_on_purpose}}}}}],
+      {?eh,test_stats,{4,1,{0,1}}},
+      {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_and_grs,[{repeat,2}]},ok}}],
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_and_grs,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,test_stats,{5,1,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,{failed,{error,{{badmatch,2},'_'}}}}},
+      {?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,test_stats,{7,2,{0,1}}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_init,[]},
+		     {failed,{error,fails_on_purpose}}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {failed,{repeat_1_SUITE,init_per_group,
+				   {'EXIT',fails_on_purpose}}}}},
+       {?eh,test_stats,{7,2,{0,2}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			  {failed,{repeat_1_SUITE,init_per_group,
+				   {'EXIT',fails_on_purpose}}}}}],
+      {?eh,test_stats,{8,2,{0,2}}},
+      {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_and_grs,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
 
-test_events(repeat_seq_1) ->
-    [];
+test_events(repeat_seq) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_seq,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_1,[sequence,{repeat,2}]},
+		     ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,test_stats,{1,1,{0,0}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+			  {failed,{repeat_1_SUITE,tc_fail_1}}}},
+       {?eh,test_stats,{1,1,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_1,[sequence,{repeat,2}]},
+		     ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_seq_1,
+				     [sequence]},ok}},
+       {?eh,test_stats,{2,2,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_seq_1,
+				     [sequence]},ok}}],
 
-test_events(repeat_seq_2) ->
-    [];
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_2,[sequence,{repeat,2}]},
+		     ok}},
+       {?eh,test_stats,{3,2,{0,2}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {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}}}],
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+			  {group_result,gr_fail_result,failed}}},
+       {?eh,test_stats,{4,2,{0,3}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_2,[sequence,{repeat,2}]},
+		     ok}}],
+      [{?eh,tc_done,
+        {repeat_1_SUITE,{init_per_group,repeat_seq_2,[sequence]},ok}},
+       {?eh,test_stats,{6,2,{0,4}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_seq_2,
+				     [sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_3,[sequence,{repeat,2}]},
+		     ok}},
+       {?eh,test_stats,{7,2,{0,4}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+	{?eh,test_stats,{7,2,{0,5}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,
+			    {repeat_1_SUITE,init_per_group,
+			     {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+			  {group_result,gr_fail_init,failed}}},
+       {?eh,test_stats,{7,2,{0,6}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_3,[sequence,{repeat,2}]},
+		     ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_3,[sequence]},ok}},
+       {?eh,test_stats,{8,2,{0,8}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_3,[sequence]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_4,[sequence,{repeat,2}]},
+		     ok}},
+       {?eh,test_stats,{8,3,{0,8}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,
+			  tc_ok_1,{failed,{repeat_1_SUITE,tc_fail_1}}}},
+       {?eh,test_stats,{8,3,{0,9}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,
+			  tc_ok_1,{failed,{repeat_1_SUITE,tc_fail_1}}}},
+       {?eh,test_stats,{8,3,{0,10}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_4,[sequence,{repeat,2}]},
+		     ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_seq_4,[sequence]},ok}},
+       {?eh,test_stats,{8,4,{0,12}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_4,[sequence]},ok}}],
+
+      {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_seq,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
 
 test_events(repeat_cs_until_any_ok) ->
-    [];
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_cs_until_any_ok,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_any_ok_1,
+		      [{repeat_until_any_ok,3}]},ok}},
+       {?eh,test_stats,{0,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{0,3,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_any_ok_1,
+		      [{repeat_until_any_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_any_ok_1,
+		      [{repeat_until_any_ok,2}]},ok}},
+       {?eh,test_stats,{0,5,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+       {?eh,test_stats,{1,5,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_any_ok_1,
+		      [{repeat_until_any_ok,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_any_ok_2,
+		      [{repeat_until_any_ok,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{2,5,{0,0}}},
+       {?eh,test_stats,{2,6,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_any_ok_2,
+		      [{repeat_until_any_ok,3}]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_cs_until_any_ok,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_gr_until_any_ok) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,
+       {repeat_1_SUITE,{init_per_group,repeat_gr_until_any_ok,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_any_ok_1,
+		      [{repeat_until_any_ok,3}]},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}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,
+		     {failed,{error,{{badmatch,2},'_'}}}}},
+       {?eh,test_stats,{1,1,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+	{?eh,test_stats,{1,1,{0,1}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',fails_on_purpose}}}}}],
+       {?eh,test_stats,{1,2,{0,1}}},
+       [{?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}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_any_ok_1,
+		      [{repeat_until_any_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_any_ok_1,
+		      [{repeat_until_any_ok,2}]},ok}},
+       %% ...
+       {?eh,test_stats,{3,4,{0,2}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result_then_ok,[]},ok}},
+         {?eh,test_stats,{4,4,{0,2}}},
+        {?eh,tc_done,{repeat_1_SUITE,
+		      {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,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {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}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,
+		     {failed,{error,{{badmatch,2},'_'}}}}},
+       {?eh,test_stats,{5,5,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{5,6,{0,2}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+         {?eh,test_stats,{5,6,{0,3}}},
+         {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			    {failed,{repeat_1_SUITE,init_per_group,
+				     {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_any_ok_2,
+		      [{repeat_until_any_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_any_ok_2,
+		      [{repeat_until_any_ok,2}]},ok}},
+        {?eh,test_stats,{6,7,{0,3}}},
+        {?eh,tc_start,{repeat_1_SUITE,tc_fail_then_ok_1}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+        {?eh,test_stats,{7,7,{0,3}}},
+        [{?eh,tc_done,{repeat_1_SUITE,
+		       {init_per_group,gr_fail_init,[]},
+		       {failed,{error,fails_on_purpose}}}},
+	 {?eh,test_stats,{7,7,{0,4}}},
+	 {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			    {failed,{repeat_1_SUITE,init_per_group,
+				     {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_any_ok_2,
+		      [{repeat_until_any_ok,2}]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_gr_until_any_ok,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
 
 test_events(repeat_cs_until_any_fail) ->
-    [];
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     {?eh,tc_start,{repeat_1_SUITE,init_per_suite}},
+     {?eh,tc_done,{repeat_1_SUITE,init_per_suite,ok}},
+     [{?eh,tc_start,
+       {repeat_1_SUITE,{init_per_group,repeat_cs_until_any_fail,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{init_per_group,repeat_cs_until_any_fail,[]},ok}},
+      [{?eh,tc_start,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,3}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,3}]},
+	 ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{2,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{3,0,{0,0}}},
+       {?eh,tc_start,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,3}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,3}]},
+	 ok}}],
+      [{?eh,tc_start,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,2}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,2}]},
+	 ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{4,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{5,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+       {?eh,tc_done,
+	{repeat_1_SUITE,tc_ok_then_fail_1,
+	 {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{5,1,{0,0}}},
+       {?eh,tc_start,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,2}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,2}]},
+	 ok}}],
+      [{?eh,tc_start,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_2,
+	  [{repeat_until_any_fail,3}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_2,
+	  [{repeat_until_any_fail,3}]},
+	 ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,tc_done,
+	{repeat_1_SUITE,tc_fail_1,
+	 {failed,
+	  {error,
+	   {{badmatch,2},
+	    [{repeat_1_SUITE,tc_fail_1,1},
+	     {repeat_1_SUITE,tc_fail_1,1},
+	     {test_server,my_apply,3},
+	     {test_server,ts_tc,3},
+	     {test_server,run_test_case_eval1,6},
+	     {test_server,run_test_case_eval,8}]}}}}},
+       {?eh,test_stats,{5,2,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_2}},
+       {?eh,tc_done,
+	{repeat_1_SUITE,tc_fail_2,{failed,{error,exit_on_purpose}}}},
+       {?eh,test_stats,{5,3,{0,0}}},
+       {?eh,tc_start,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_2,
+	  [{repeat_until_any_fail,3}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_2,
+	  [{repeat_until_any_fail,3}]},
+	 ok}}],
+      {?eh,tc_start,
+       {repeat_1_SUITE,{end_per_group,repeat_cs_until_any_fail,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{end_per_group,repeat_cs_until_any_fail,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,end_per_suite}},
+     {?eh,tc_done,{repeat_1_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_gr_until_any_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+ {?eh,start_info,{1,1,unknown}},
+ {?eh,tc_start,{repeat_1_SUITE,init_per_suite}},
+ {?eh,tc_done,{repeat_1_SUITE,init_per_suite,ok}},
+ [{?eh,tc_start,
+      {repeat_1_SUITE,{init_per_group,repeat_gr_until_any_fail,[]}}},
+  {?eh,tc_done,
+      {repeat_1_SUITE,{init_per_group,repeat_gr_until_any_fail,[]},ok}},
+   [{?eh,tc_start,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,3}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,3}]},
+            ok}},
+     [{?eh,tc_start,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+      {?eh,tc_start,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     [{?eh,tc_start,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_result,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_result,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{3,0,{0,0}}},
+      {?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,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+     {?eh,test_stats,{4,0,{0,0}}},
+    {?eh,tc_start,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,3}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,3}]},
+            ok}}],
+   [{?eh,tc_start,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,2}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,2}]},
+            ok}},
+     [{?eh,tc_start,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{5,0,{0,0}}},
+      {?eh,tc_start,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+     {?eh,test_stats,{6,0,{0,0}}},
+     [{?eh,tc_start,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_result,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_result,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{7,0,{0,0}}},
+      {?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}}}],
+     {?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}}},
+    {?eh,tc_start,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,2}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,2}]},
+            ok}}],
+   [{?eh,tc_start,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,3}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,3}]},
+            ok}},
+     [{?eh,tc_start,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{9,0,{0,0}}},
+      {?eh,tc_start,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+     {?eh,test_stats,{10,0,{0,0}}},
+     [{?eh,tc_start,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_init,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_init,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{11,0,{0,0}}},
+      {?eh,tc_start,
+          {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+     {?eh,test_stats,{12,0,{0,0}}},
+    {?eh,tc_start,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,3}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,3}]},
+            ok}}],
+   [{?eh,tc_start,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,2}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,2}]},
+            ok}},
+     [{?eh,tc_start,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{13,0,{0,0}}},
+      {?eh,tc_start,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+     {?eh,test_stats,{14,0,{0,0}}},
+     [{?eh,tc_start,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_init,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,
+              {init_per_group,gr_ok_then_fail_init,[]},
+              {failed,{error,failing_this_time}}}},
+       {?eh,tc_auto_skip,
+           {repeat_1_SUITE,tc_ok_1,
+               {failed,
+                   {repeat_1_SUITE,init_per_group,
+                       {'EXIT',failing_this_time}}}}},
+       {?eh,test_stats,{14,0,{0,1}}},
+       {?eh,tc_auto_skip,
+           {repeat_1_SUITE,end_per_group,
+               {failed,
+                   {repeat_1_SUITE,init_per_group,
+                       {'EXIT',failing_this_time}}}}}],
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+      {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+      {?eh,test_stats,{15,0,{0,1}}},
+     {?eh,tc_start,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_2,
+                 [{repeat_until_any_fail,2}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_2,
+                 [{repeat_until_any_fail,2}]},
+             ok}}],
+    [{?eh,tc_start,
+         {repeat_1_SUITE,
+             {init_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,3}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {init_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,3}]},
+             ok}},
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+      {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+      {?eh,test_stats,{16,0,{0,1}}},
+      [{?eh,tc_start,
+                           {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+       {?eh,tc_done,
+                           {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+        {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{17,0,{0,1}}},
+       {?eh,tc_start,
+                           {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+       {?eh,tc_done,
+                           {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+      {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+      {?eh,test_stats,{18,0,{0,1}}},
+     {?eh,tc_start,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,3}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,3}]},
+             ok}}],
+    [{?eh,tc_start,
+         {repeat_1_SUITE,
+             {init_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,2}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {init_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,2}]},
+             ok}},
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,tc_ok_then_fail_1,
+              {failed,{error,failing_this_time}}}},
+      {?eh,test_stats,{18,1,{0,1}}},
+      [{?eh,tc_start,
+                           {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+       {?eh,tc_done,
+                           {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+        {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{19,1,{0,1}}},
+       {?eh,tc_start,
+                           {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+       {?eh,tc_done,
+                           {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+      {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+      {?eh,test_stats,{20,1,{0,1}}},
+     {?eh,tc_start,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,2}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,2}]},
+             ok}}],
+   {?eh,tc_start,
+       {repeat_1_SUITE,{end_per_group,repeat_gr_until_any_fail,[]}}},
+   {?eh,tc_done,
+       {repeat_1_SUITE,{end_per_group,repeat_gr_until_any_fail,[]},ok}}],
+  {?eh,tc_start,{repeat_1_SUITE,end_per_suite}},
+  {?eh,tc_done,{repeat_1_SUITE,end_per_suite,ok}},
+  {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
 
 test_events(repeat_cs_until_all_ok) ->
-    [];
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_until_all_ok,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_ok_1,
+		      [{repeat_until_all_ok,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{0,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{1,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_2,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{1,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_ok_1,
+		      [{repeat_until_all_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_ok_1,
+		      [{repeat_until_all_ok,2}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+       {?eh,test_stats,{2,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{3,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_2,ok}},
+       {?eh,test_stats,{4,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_ok_1,
+		      [{repeat_until_all_ok,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_ok_2,
+		      [{repeat_until_all_ok,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{6,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_ok_2,
+		      [{repeat_until_all_ok,3}]},ok}}],
+
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_cs_until_all_ok,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_gr_until_all_ok) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_gr_until_all_ok,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_1,
+		      [{repeat_until_all_ok,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,test_stats,{2,0,{0,0}}},
+	{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{2,1,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result_then_ok,[]},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}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_1,
+		      [{repeat_until_all_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_1,
+		      [{repeat_until_all_ok,2}]},ok}},
+       {?eh,test_stats,{5,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+       {?eh,test_stats,{6,1,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result_then_ok,[]},ok}},
+	{?eh,test_stats,{7,1,{0,0}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {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,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_2,
+		      [{repeat_until_all_ok,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init_then_ok,[]},
+		      {failed,{error,failing_this_time}}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',failing_this_time}}}}},
+	{?eh,test_stats,{7,1,{0,1}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',failing_this_time}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{8,1,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_2,
+		      [{repeat_until_all_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_2,
+		      [{repeat_until_all_ok,2}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init_then_ok,[]},ok}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{9,1,{0,1}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_init_then_ok,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{10,1,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_2,
+		      [{repeat_until_all_ok,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_3,
+		      [{repeat_until_all_ok,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{11,1,{0,1}}},
+	{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{11,2,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_3,
+		      [{repeat_until_all_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_3,
+		      [{repeat_until_all_ok,2}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{12,2,{0,1}}},
+	{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+       {?eh,test_stats,{13,2,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_3,
+		      [{repeat_until_all_ok,2}]},ok}}],
+
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_gr_until_all_ok,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
 
 test_events(repeat_cs_until_all_fail) ->
-    [].
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_cs_until_all_fail,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_fail_1,
+		      [{repeat_until_all_fail,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{1,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_2,ok}},
+       {?eh,test_stats,{2,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_fail_1,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_fail_1,
+		      [{repeat_until_all_fail,2}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{2,2,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{2,3,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_2,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{2,4,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_fail_1,
+		      [{repeat_until_all_fail,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_fail_2,
+		      [{repeat_until_all_fail,3}]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{2,5,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_fail_2,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_cs_until_all_fail,[]},ok}}],
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_gr_until_all_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_gr_until_all_fail,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_1,
+		      [{repeat_until_all_fail,3}]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{0,1,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+	{?eh,test_stats,{0,1,{0,1}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{1,1,{0,1}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{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,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_1,
+		      [{repeat_until_all_fail,2}]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{2,2,{0,1}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+        {?eh,test_stats,{2,2,{0,2}}},
+        {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{2,3,{0,2}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,
+				      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}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_1,
+		      [{repeat_until_all_fail,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_2,
+		      [{repeat_until_all_fail,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init,[]},ok}}],
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{4,4,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_2,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_2,
+		      [{repeat_until_all_fail,2}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_ok_then_fail_init,[]},
+		      {failed,{error,failing_this_time}}}},
+	{?eh,test_stats,{4,4,{0,3}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',failing_this_time}}}}}],
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{4,5,{0,3}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_2,
+		      [{repeat_until_all_fail,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {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}}}],
+       {?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,
+		     {end_per_group,repeat_gr_until_all_fail_3,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {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}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{7,6,{0,3}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_3,
+		      [{repeat_until_all_fail,2}]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_gr_until_all_fail,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_seq_until_any_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_seq_until_any_fail,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_1,
+		      [sequence,{repeat_until_any_fail,2}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{2,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_1,
+		      [sequence,{repeat_until_any_fail,2}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,
+		      repeat_seq_until_any_fail_1,[sequence]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{4,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,
+		      repeat_seq_until_any_fail_1,[sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_2,
+		      [{repeat_until_any_fail,2},sequence]},ok}},
+       {?eh,test_stats,{5,0,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,test_stats,{7,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_2,
+		      [{repeat_until_any_fail,2},sequence]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_2,[sequence]},
+		     ok}},
+       {?eh,test_stats,{8,0,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,test_stats,{10,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_2,[sequence]},
+		     ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_3,
+		      [sequence,{repeat_until_any_fail,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{11,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{12,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{13,0,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_3,
+		      [sequence,{repeat_until_any_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_3,
+		      [{repeat_until_any_fail,2},sequence]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{15,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{15,1,{0,0}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+			  {failed,{repeat_1_SUITE,tc_ok_then_fail_1}}}},
+       {?eh,test_stats,{15,1,{0,1}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {failed,{repeat_1_SUITE,tc_ok_then_fail_1}}}},
+       {?eh,test_stats,{15,1,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_3,
+		      [{repeat_until_any_fail,2},sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_4,
+		      [{repeat_until_any_fail,3},sequence]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,
+				      gr_ok_then_fail_result,[]},ok}}],
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{18,1,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_4,
+		      [{repeat_until_any_fail,3},sequence]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {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}}}],
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {group_result,gr_ok_then_fail_result,failed}}},
+       {?eh,test_stats,{19,1,{0,3}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {group_result,gr_ok_then_fail_result,failed}}},
+       {?eh,test_stats,{19,1,{0,4}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_4,
+		      [{repeat_until_any_fail,2},sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_5,
+		      [{repeat_until_any_fail,3},sequence]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init,[]},ok}}],
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_2,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{23,1,{0,4}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_5,
+		      [{repeat_until_any_fail,3},sequence]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_5,
+		      [{repeat_until_any_fail,2},sequence]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_ok_then_fail_init,[]},
+		      {failed,{error,failing_this_time}}}},
+	{?eh,test_stats,{24,1,{0,5}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',failing_this_time}}}}}],
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {group_result,gr_ok_then_fail_init,failed}}},
+       {?eh,test_stats,{24,1,{0,6}}},
+      {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			 {group_result,gr_ok_then_fail_init,failed}}},
+       {?eh,test_stats,{24,1,{0,7}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_5,
+		      [{repeat_until_any_fail,2},sequence]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_seq_until_any_fail,[]},ok}}],
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+%%! Note that when testing shuffled groups, ct_test_support expects
+%%! both the start and done event for cases and init/end_per_group
+test_events(repeat_shuffled_seq_until_any_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_shuffled_seq_until_any_fail,[]},
+		    ok}},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_1,
+			[{shuffle,'_'},sequence,
+			 {repeat_until_any_fail,2}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [{shuffle,'_'},sequence,
+			{repeat_until_any_fail,2}]},ok}},
+	{?eh,test_stats,{2,0,{0,0}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_1,
+			[sequence,shuffle,{repeat_until_any_fail,2}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [sequence,shuffle,{repeat_until_any_fail,2}]},ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_1,
+			[{shuffle,'_'},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [{shuffle,'_'},sequence]},ok}},
+	{?eh,test_stats,{4,0,{0,0}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [{shuffle,repeated},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [{shuffle,repeated},sequence]},ok}}]},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,2},sequence]},
+		      ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	{?eh,test_stats,{7,0,{0,0}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_2,
+			[{repeat_until_any_fail,2},{shuffle,{1,2,3}},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{repeat_until_any_fail,2},{shuffle,{1,2,3}},sequence]},
+		      ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_2,
+			[{shuffle,'_'},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{shuffle,'_'},sequence]},ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_2,
+			[{shuffle,repeated},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{shuffle,repeated},sequence]},ok}}]},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,'_'},sequence,
+			{repeat_until_any_fail,3}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,'_'},sequence,
+			{repeat_until_any_fail,3}]},ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	{?eh,test_stats,{14,0,{0,0}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_3,
+			[shuffle,sequence,{repeat_until_any_fail,3}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [shuffle,sequence,{repeat_until_any_fail,3}]},ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},sequence]},
+		      ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		      {failed,{error,failing_this_time}}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,repeated},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,repeated},{repeat_until_any_fail,2},sequence]},
+		      ok}}]},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,3},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,3},sequence]},
+		      ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	[{?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,[]},ok}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_4,
+			[{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}]},
+		      ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_4,
+			[{shuffle,'_'},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},sequence]},
+		      ok}},
+	[{?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}}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_4,
+			[{shuffle,repeated},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{shuffle,repeated},{repeat_until_any_fail,2},sequence]},
+		      ok}}]},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_5,
+			[{shuffle,{1,2,3}},{repeat_until_any_fail,3},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,3},sequence]},
+		      ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_2,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_2,[]},ok}}],
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,
+					gr_ok_then_fail_init,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,
+				       gr_ok_then_fail_init,[]},ok}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_5,
+			[{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}]},
+		      ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},
+			sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},
+			sequence]},ok}},
+	[{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			    {failed,{repeat_1_SUITE,init_per_group,
+				     {'EXIT',failing_this_time}}}}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_5,
+			[{shuffle,repeated},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{shuffle,repeated},{repeat_until_any_fail,2},sequence]},
+		      ok}}]},
+
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_shuffled_seq_until_any_fail,[]},
+		     ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}].
diff --git a/lib/common_test/test/ct_repeat_1_SUITE_data/repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE_data/repeat_1_SUITE.erl
index 5b097c11e9..fb8d31edd4 100644
--- a/lib/common_test/test/ct_repeat_1_SUITE_data/repeat_1_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_1_SUITE_data/repeat_1_SUITE.erl
@@ -196,15 +196,13 @@ groups() ->
 
      %%---------------------------------------------------------------
      {repeat_gr_until_any_ok, [], [{group,repeat_gr_until_any_ok_1},
-				   {group,repeat_gr_until_any_ok_2},
-				   {group,repeat_gr_until_any_ok_3}]},
-
+				   {group,repeat_gr_until_any_ok_2}]},
      {repeat_gr_until_any_ok_1, [{repeat_until_any_ok,3}],
-      [{group,gr_fail_result}, tc_fail_1, {group,gr_fail_init}, tc_fail_2, {group,gr_fail_result_then_ok}]},
+      [{group,gr_fail_result}, tc_fail_1, {group,gr_fail_init}, tc_fail_2,
+       {group,gr_fail_result_then_ok}]},
      {repeat_gr_until_any_ok_2, [{repeat_until_any_ok,3}],
-      [{group,gr_fail_result}, tc_fail_1, {group,gr_fail_init}, tc_fail_2, {group,gr_fail_init_then_ok}]},
-     {repeat_gr_until_any_ok_3, [{repeat_until_any_ok,3}],
-      [{group,gr_fail_result}, tc_fail_1, tc_fail_then_ok_1, {group,gr_fail_init}]},
+      [{group,gr_fail_result}, tc_fail_1, tc_fail_then_ok_1,
+       {group,gr_fail_init}]},
 
      %%---------------------------------------------------------------
      {repeat_cs_until_any_fail, [], [{group,repeat_cs_until_any_fail_1},