Merge branch 'siri/ct/fuzzer_support/ERIERL-143/OTP-14746' into maint

* siri/ct/fuzzer_support/ERIERL-143/OTP-14746:
  [ct] Fix bug with faulty suite name in end_per_suite config
  [ct] Add {testcase,TC,RepeatProps} syntax for repeating test cases
  [ct] Add post_groups/2 and post_all/3 hook functions

9 files changed, 1155 insertions, 3 deletions

diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index bb3e7a1eca..e510b74d6a 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -75,7 +75,8 @@ MODULES= \
 	ct_keep_logs_SUITE \
 	ct_unicode_SUITE \
 	ct_auto_clean_SUITE \
-	ct_util_SUITE
+	ct_util_SUITE \
+	ct_tc_repeat_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 HRL_FILES= test_server_test_lib.hrl
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 44b86b1dfe..340b8f3d52 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -73,11 +73,15 @@ all() ->
 all(suite) ->
     lists:reverse(
       [
+       crash_groups, crash_all, bad_return_groups, bad_return_all,
+       illegal_values_groups, illegal_values_all, alter_groups, alter_all,
+       alter_all_to_skip, alter_all_from_skip,
        one_cth, two_cth, faulty_cth_no_init, faulty_cth_id_no_init,
        faulty_cth_exit_in_init, faulty_cth_exit_in_id,
        faulty_cth_exit_in_init_scope_suite, minimal_cth,
        minimal_and_maximal_cth, faulty_cth_undef,
        scope_per_suite_cth, scope_per_group_cth, scope_suite_cth,
+       scope_suite_group_only_cth,
        scope_per_suite_state_cth, scope_per_group_state_cth,
        scope_suite_state_cth,
        fail_pre_suite_cth, double_fail_pre_suite_cth,
@@ -152,6 +156,11 @@ scope_suite_cth(Config) when is_list(Config) ->
     do_test(scope_suite_cth, "ct_scope_suite_cth_SUITE.erl",
 	    [],Config).
 
+scope_suite_group_only_cth(Config) when is_list(Config) ->
+    do_test(scope_suite_group_only_cth,
+            "ct_scope_suite_group_only_cth_SUITE.erl",
+	    [],Config,ok,2,[{group,g1}]).
+
 scope_per_group_cth(Config) when is_list(Config) ->
     do_test(scope_per_group_cth, "ct_scope_per_group_cth_SUITE.erl",
 	    [],Config).
@@ -304,10 +313,74 @@ repeat_force_stop(Config) ->
             [{force_stop,skip_rest},{duration,"000009"}]).
 
 %% Test that expected callbacks, and only those, are called when a test
-%% are fails due to clash in config alias names
+%% fails due to clash in config alias names
 config_clash(Config) ->
     do_test(config_clash, "config_clash_SUITE.erl", [skip_cth], Config).
 
+%% Test post_groups and post_all hook callbacks, introduced by OTP-14746
+alter_groups(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_groups_return,[{new_group,[tc1,tc2]}]},
+                          {post_all_return,[{group,new_group}]}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+alter_all(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_all_return,[tc2]}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+alter_all_from_skip(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{all_return,{skip,"skipped by all/0"}},
+                                         {post_all_return,[tc2]}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+alter_all_to_skip(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_all_return,{skip,"skipped by post_all/3"}}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+bad_return_groups(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_groups_return,not_a_list}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+bad_return_all(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_all_return,not_a_list}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+illegal_values_groups(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_groups_return,[{new_group,[this_test_does_not_exist]},
+                                          this_is_not_a_group_def]}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+illegal_values_all(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_all_return,[{group,this_group_does_not_exist},
+                                       {this_is_not_a_valid_term}]}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+crash_groups(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_groups_return,crash}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+crash_all(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_all_return,crash}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
@@ -327,6 +400,7 @@ do_test(Tag, {WhatTag,Wildcard}, CTHs, Config, Res, EC, ExtraOpts) ->
                filename:join([DataDir,"cth/tests",Wildcard])),
     {Opts,ERPid} =
         setup([{WhatTag,Files},{ct_hooks,CTHs},{label,Tag}|ExtraOpts], Config),
+
     Res = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
@@ -352,6 +426,13 @@ reformat(Events, EH) ->
 %reformat(Events, _EH) ->
 %    Events.
 
+gen_config(Name,KeyVals,Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    File = filename:join(PrivDir,atom_to_list(Name)++".cfg"),
+    ok = file:write_file(File,[io_lib:format("~p.~n",[{Key,Value}])
+                               || {Key,Value} <- KeyVals]),
+    File.
+
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
 %%%-----------------------------------------------------------------
@@ -370,13 +451,16 @@ test_events(one_empty_cth) ->
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,cth,{empty_cth,id,[[]]}},
      {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     %% check that post_groups and post_all comes after init when hook
+     %% is installed with start flag/option.
+     {?eh,cth,{empty_cth,post_groups,[ct_cth_empty_SUITE,[]]}},
+     {?eh,cth,{empty_cth,post_all,[ct_cth_empty_SUITE,[test_case],[]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{empty_cth,pre_init_per_suite,
 	       [ct_cth_empty_SUITE,'$proplist',[]]}},
      {?eh,cth,{empty_cth,post_init_per_suite,
 	       [ct_cth_empty_SUITE,'$proplist','$proplist',[]]}},
      {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,ok}},
-
      {?eh,tc_start,{ct_cth_empty_SUITE,test_case}},
      {?eh,cth,{empty_cth,pre_init_per_testcase,[ct_cth_empty_SUITE,test_case,'$proplist',[]]}},
      {?eh,cth,{empty_cth,post_init_per_testcase,[ct_cth_empty_SUITE,test_case,'$proplist','_',[]]}},
@@ -585,6 +669,10 @@ test_events(scope_suite_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     %% check that post_groups and post_all comes before init when hook
+     %% is installed in suite/0
+     {?eh,cth,{'_',post_groups,['_',[]]}},
+     {?eh,cth,{'_',post_all,['_','_',[]]}},
      {?eh,tc_start,{ct_scope_suite_cth_SUITE,init_per_suite}},
      {?eh,cth,{'_',id,[[]]}},
      {?eh,cth,{'_',init,['_',[]]}},
@@ -606,6 +694,34 @@ test_events(scope_suite_cth) ->
      {?eh,stop_logging,[]}
     ];
 
+test_events(scope_suite_group_only_cth) ->
+    Suite = ct_scope_suite_group_only_cth_SUITE,
+    CTH = empty_cth,
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     %% check that post_groups and post_all comes before init when hook
+     %% is installed in suite/0
+     {?eh,cth,{CTH,post_groups,['_',['_']]}},
+     {negative,
+      {?eh,cth,{CTH,post_all,['_','_','_']}},
+      {?eh,tc_start,{Suite,init_per_suite}}},
+     {?eh,cth,{CTH,id,[[]]}},
+     {?eh,cth,{CTH,init,['_',[]]}},
+     {?eh,cth,{CTH,pre_init_per_suite,[Suite,'$proplist',mystate]}},
+     {?eh,cth,{CTH,post_init_per_suite,[Suite,'$proplist','$proplist',mystate]}},
+     {?eh,tc_done,{Suite,init_per_suite,ok}},
+
+     {?eh,tc_start,{Suite,end_per_suite}},
+     {?eh,cth,{CTH,pre_end_per_suite,[Suite,'$proplist',mystate]}},
+     {?eh,cth,{CTH,post_end_per_suite,[Suite,'$proplist','_',mystate]}},
+     {?eh,cth,{CTH,terminate,[mystate]}},
+     {?eh,tc_done,{Suite,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(scope_per_group_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
@@ -665,6 +781,8 @@ test_events(scope_suite_state_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',post_groups,['_',[]]}},
+     {?eh,cth,{'_',post_all,['_','_',[]]}},
      {?eh,tc_start,{ct_scope_suite_state_cth_SUITE,init_per_suite}},
      {?eh,cth,{'_',id,[[test]]}},
      {?eh,cth,{'_',init,['_',[test]]}},
@@ -2313,6 +2431,229 @@ test_events(config_clash) ->
     %% Make sure no 'cth_error' events are received!
     [{negative,{?eh,cth_error,'_'},E} || E <- Events];
 
+test_events(alter_groups) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{new_group,[tc1,tc2]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[{group,new_group}],
+                                   [{new_group,[tc1,tc2]}]]}},
+     {?eh,start_info,{1,1,2}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{new_group,[tc1,tc2]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[{group,new_group}],
+                                   [{new_group,[tc1,tc2]}]]}},
+     {?eh,tc_start,{all_and_groups_SUITE,{init_per_group,new_group,[]}}},
+     {?eh,tc_done,{all_and_groups_SUITE,
+                   {init_per_group,new_group,'$proplist'},ok}},
+     {?eh,tc_start,{all_and_groups_SUITE,tc1}},
+     {?eh,tc_done,{all_and_groups_SUITE,tc1,ok}},
+     {?eh,tc_start,{all_and_groups_SUITE,tc2}},
+     {?eh,tc_done,{all_and_groups_SUITE,tc2,ok}},
+     {?eh,tc_start,{all_and_groups_SUITE,{end_per_group,new_group,[]}}},
+     {?eh,tc_done,{all_and_groups_SUITE,
+                   {end_per_group,new_group,'$proplist'},ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(alter_all) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{test_group,[tc1]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[tc2],
+                                   [{test_group,[tc1]}]]}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[tc2],'_']}},
+     {?eh,tc_start,{all_and_groups_SUITE,tc2}},
+     {?eh,tc_done,{all_and_groups_SUITE,tc2,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(alter_all_from_skip) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{test_group,[tc1]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[tc2],
+                                   [{test_group,[tc1]}]]}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[tc2],'_']}},
+     {?eh,tc_start,{all_and_groups_SUITE,tc2}},
+     {?eh,tc_done,{all_and_groups_SUITE,tc2,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(alter_all_to_skip) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{test_group,[tc1]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,
+                                   {skip,"skipped by post_all/3"},
+                                   [{test_group,[tc1]}]]}},
+     {?eh,start_info,{1,1,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,
+                                   {skip,"skipped by post_all/3"},
+                                   '_']}},
+     {?eh,tc_user_skip,{all_and_groups_SUITE,all,"skipped by post_all/3"}},
+     {?eh,cth,{'_',on_tc_skip,[all_and_groups_SUITE,all,
+                               {tc_user_skip,"skipped by post_all/3"},
+                               []]}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(illegal_values_groups) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,
+               [all_and_groups_SUITE,
+                [{new_group,[this_test_does_not_exist]},
+                 this_is_not_a_group_def]]}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,
+               [all_and_groups_SUITE,
+                [{new_group,[this_test_does_not_exist]},
+                 this_is_not_a_group_def]]}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,{ct_framework,error_in_suite,{failed,{error,'_'}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(illegal_values_all) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,
+               [all_and_groups_SUITE,
+                [{group,this_group_does_not_exist},
+                 {this_is_not_a_valid_term}],'_']}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,
+               [all_and_groups_SUITE,
+                [{group,this_group_does_not_exist},
+                 {this_is_not_a_valid_term}],'_']}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,
+      {ct_framework,error_in_suite,
+       {failed,
+        {error,'Invalid reference to group this_group_does_not_exist in all_and_groups_SUITE:all/0'}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(bad_return_groups) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,not_a_list]}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,not_a_list]}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,
+      {ct_framework,error_in_suite,
+       {failed,
+        {error,
+         {'Bad return value from post_groups/2 hook function',not_a_list}}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(bad_return_all) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,not_a_list,'_']}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,not_a_list,'_']}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,
+      {ct_framework,error_in_suite,
+       {failed,
+        {error,{'Bad return value from post_all/3 hook function',not_a_list}}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(crash_groups) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,crash]}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,crash]}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,{ct_framework,error_in_suite,
+                   {failed,
+                    {error,"all_and_groups_cth:post_groups/2 CTH call failed"}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(crash_all) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,crash,'_']}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,crash,'_']}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,{ct_framework,error_in_suite,
+                   {failed,
+                    {error,"all_and_groups_cth:post_all/3 CTH call failed"}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(ok) ->
     ok.
 
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_SUITE.erl
new file mode 100644
index 0000000000..adc86005f9
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_SUITE.erl
@@ -0,0 +1,47 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(all_and_groups_SUITE).
+
+-suite_defaults([{timetrap, {minutes, 10}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+init_per_group(_Group,Config) ->
+    Config.
+
+end_per_group(_Group,Config) ->
+    ok.
+
+all() ->
+    ct:get_config(all_return,[{group,test_group}]).
+
+groups() ->
+    [{test_group,[tc1]}].
+
+%% Test cases starts here.
+tc1(Config) ->
+    ok.
+
+tc2(Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_cth.erl
new file mode 100644
index 0000000000..9ebc00e9de
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_cth.erl
@@ -0,0 +1,100 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(all_and_groups_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+%% Send a cth_error event if a callback is called with unexpected arguments
+-define(fail(Info),
+        gen_event:notify(
+          ?CT_EVMGR_REF, 
+          #event{ name = cth_error,
+                  node = node(),
+                  data = {illegal_hook_callback,{?MODULE,?FUNCTION_NAME,Info}}})).
+
+%% CT Hooks
+-compile(export_all).
+
+id(Opts) ->
+    empty_cth:id(Opts).
+
+post_groups(Suite,Groups) ->
+    case empty_cth:post_groups(Suite,ct:get_config(post_groups_return,Groups)) of
+        crash -> error(crash_in_post_groups);
+        R -> R
+    end.
+
+post_all(Suite,Tests,Groups) ->
+    case empty_cth:post_all(Suite,ct:get_config(post_all_return,Tests),Groups) of
+        crash -> error(crash_in_post_all);
+        R -> R
+    end.
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Suite,Group,Config,State) ->
+    empty_cth:pre_init_per_group(Suite,Group,Config,State).
+
+post_init_per_group(Suite,Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Suite,Group,Config,Return,State).
+
+pre_end_per_group(Suite,Group,Config,State) ->
+    empty_cth:pre_end_per_group(Suite,Group,Config,State).
+
+post_end_per_group(Suite,Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Suite,Group,Config,Return,State).
+
+pre_init_per_testcase(Suite,TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(Suite,TC,Config,State).
+
+post_init_per_testcase(Suite,TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(Suite,TC,Config,Return,State).
+
+pre_end_per_testcase(Suite,TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(Suite,TC,Config,State).
+
+post_end_per_testcase(Suite,TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(Suite,TC,Config,Return,State).
+
+on_tc_fail(Suite,TC,Reason,State) ->
+    empty_cth:on_tc_fail(Suite,TC,Reason,State).
+
+on_tc_skip(Suite,TC,Reason,State) ->
+    empty_cth:on_tc_skip(Suite,TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_match_state_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_match_state_cth.erl
new file mode 100644
index 0000000000..38c9da903d
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_match_state_cth.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(ct_match_state_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-compile(export_all).
+
+id(Opts) ->
+    empty_cth:id(Opts).
+
+post_groups(Suite, Groups) ->
+    empty_cth:post_groups(Suite, Groups).
+
+post_all(Suite, Tests, Groups) ->
+    empty_cth:post_all(Suite, Tests, Groups).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts),
+    {ok,mystate}.
+
+%% In the following, always match against the state value, to ensure
+%% that init has indeed been called before the rest of the hooks.
+pre_init_per_suite(Suite,Config,mystate) ->
+    empty_cth:pre_init_per_suite(Suite,Config,mystate).
+
+post_init_per_suite(Suite,Config,Return,mystate) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,mystate).
+
+pre_end_per_suite(Suite,Config,mystate) ->
+    empty_cth:pre_end_per_suite(Suite,Config,mystate).
+
+post_end_per_suite(Suite,Config,Return,mystate) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,mystate).
+
+terminate(mystate) ->
+    empty_cth:terminate(mystate).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_group_only_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_group_only_cth_SUITE.erl
new file mode 100644
index 0000000000..537c97d3f0
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_group_only_cth_SUITE.erl
@@ -0,0 +1,54 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(ct_scope_suite_group_only_cth_SUITE).
+
+-suite_defaults([{timetrap, {minutes, 10}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+%% Test server callback functions
+suite() ->
+    [{ct_hooks,[ct_match_state_cth]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+all() ->
+    [test_case].
+
+groups() ->
+    [{g1,[test_case]}].
+
+%% Test cases starts here.
+test_case(Config) when is_list(Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index c648367838..60488e84c6 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -39,6 +39,9 @@
 -export([id/1]).
 -export([init/2]).
 
+-export([post_all/3]).
+-export([post_groups/2]).
+
 -export([pre_init_per_suite/3]).
 -export([post_init_per_suite/4]).
 -export([pre_end_per_suite/3]).
@@ -71,6 +74,31 @@
 
 -record(state, { id = ?MODULE :: term()}).
 
+%% Called after groups/0.
+%% You can change the return value in this function.
+-spec post_groups(Suite :: atom(), Groups :: list()) -> list().
+post_groups(Suite,Groups) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_groups,
+				     [Suite,Groups]}}),
+    ct:log("~w:post_groups(~w) called", [?MODULE,Suite]),
+    Groups.
+
+%% Called after all/0.
+%% You can change the return value in this function.
+-spec post_all(Suite :: atom(),
+               Tests :: list(),
+               Groups :: term()) ->
+    list().
+post_all(Suite,Tests,Groups) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_all,
+				     [Suite,Tests,Groups]}}),
+    ct:log("~w:post_all(~w) called", [?MODULE,Suite]),
+    Tests.
+
 %% Always called before any other callback function. Use this to initiate
 %% any common state. It should return an state for this CTH.
 -spec init(Id :: term(), Opts :: proplists:proplist()) ->
diff --git a/lib/common_test/test/ct_tc_repeat_SUITE.erl b/lib/common_test/test/ct_tc_repeat_SUITE.erl
new file mode 100644
index 0000000000..433b5456fe
--- /dev/null
+++ b/lib/common_test/test/ct_tc_repeat_SUITE.erl
@@ -0,0 +1,438 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(ct_tc_repeat_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ct_test_support:init_per_suite([{path_dirs,[DataDir]} | Config]).
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+all() ->
+    all(suite).
+
+all(suite) ->
+      [
+       repeat,
+       repeat_parallel_until_ok,
+       repeat_parallel_until_fail,
+       repeat_sequence_until_ok,
+       repeat_sequence_until_fail,
+       pick_one_test_from_group,
+       pick_one_test_from_subgroup
+      ].
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%% 
+%% Test post_groups and post_all hook callbacks, introduced by OTP-14746
+repeat(Config) ->
+    ok = do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [], [], Config).
+
+repeat_parallel_until_ok(Config) ->
+    {error,{{illegal_combination,{parallel,repeat_until_ok}},_}} =
+        do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_parallel_until_ok}],
+                [], Config, 1, []).
+
+repeat_parallel_until_fail(Config) ->
+    {error,{{illegal_combination,{parallel,repeat_until_fail}},_}} =
+        do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_parallel_until_fail}],
+                [], Config, 1, []).
+
+repeat_sequence_until_ok(Config) ->
+    {error,{{illegal_combination,{sequence,repeat_until_ok}},_}} =
+        do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_sequence_until_ok}],
+                [], Config, 1, []).
+
+repeat_sequence_until_fail(Config) ->
+    {error,{{illegal_combination,{sequence,repeat_until_fail}},_}} =
+        do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_sequence_until_fail}],
+                [], Config, 1, []).
+
+pick_one_test_from_group(Config) ->
+    do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_mixed},{testcase,tc2}],
+            [], Config, 1, []).
+    
+pick_one_test_from_subgroup(Config) ->
+    do_test(?FUNCTION_NAME, "tc_repeat_SUITE",
+            [{group,[[g_mixed,subgroup]]},{testcase,tc2}],
+            [], Config, 1, []).
+    
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+do_test(Tag, Suite, WTT, CTHs, Config) ->
+    do_test(Tag, Suite, WTT, CTHs, Config, 2, []).
+
+do_test(Tag, Suite0, WTT, CTHs, Config, EC, ExtraOpts) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join([DataDir,Suite0]),
+    {Opts,ERPid} =
+        setup([{suite,Suite}|WTT]++[{ct_hooks,CTHs},{label,Tag}|ExtraOpts],
+              Config),
+    Res = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+    %% io:format("~p~n",[Events]),
+
+    ct_test_support:log_events(Tag,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Tag, EC),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config),
+    Res.
+
+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 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+gen_config(Name,KeyVals,Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    File = filename:join(PrivDir,atom_to_list(Name)++".cfg"),
+    ok = file:write_file(File,[io_lib:format("~p.~n",[{Key,Value}])
+                               || {Key,Value} <- KeyVals]),
+    File.
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+test_events(repeat) ->
+    S = tc_repeat_SUITE,
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+
+     %% tc1, {repeat,2}
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     %% tc2, {repeat_until_ok,3}
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{3,0,{0,0}}},
+     %% tc3, {repeat_until_ok,3}
+     {?eh,tc_start,{S,tc3}},
+     {?eh,tc_done,{tc_repeat_SUITE,tc3,
+                   {failed,{error,{test_case_failed,always_fail}}}}},
+     {?eh,test_stats,{3,1,{0,0}}},
+     {?eh,tc_start,{S,tc3}},
+     {?eh,tc_done,{S,tc3,{failed,{error,{test_case_failed,always_fail}}}}},
+     {?eh,test_stats,{3,2,{0,0}}},
+     {?eh,tc_start,{S,tc3}},
+     {?eh,tc_done,{S,tc3,{failed,{error,{test_case_failed,always_fail}}}}},
+     {?eh,test_stats,{3,3,{0,0}}},
+     %% tc4, {repeat_until_fail,3}
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,ok}},
+     {?eh,test_stats,{4,3,{0,0}}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,{failed,{error,{test_case_failed,second_time_fail}}}}},
+     {?eh,test_stats,{4,4,{0,0}}},
+     %% g, tc1, {repeat,2}
+     {?eh,tc_start,{S,{init_per_group,g,[]}}},
+     {?eh,tc_done,{S,{init_per_group,g,[]},ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{5,4,{0,0}}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{6,4,{0,0}}},
+     {?eh,tc_start,{S,{end_per_group,g,[]}}},
+     {?eh,tc_done,{S,{end_per_group,g,[]},ok}},
+     %% g_until_ok, tc2, {repeat_until_ok,3}
+     {?eh,tc_start,{S,{init_per_group,g_until_ok,[]}}},
+     {?eh,tc_done,{S,{init_per_group,g_until_ok,[]},ok}},
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{7,4,{0,0}}},
+     {?eh,tc_start,{S,{end_per_group,g_until_ok,[]}}},
+     {?eh,tc_done,{S,{end_per_group,g_until_ok,[]},ok}},
+     %% g_until_fail, tc4, {repeat_until_fail,3}
+     {?eh,tc_start,{S,{init_per_group,g_until_fail,[]}}},
+     {?eh,tc_done,{S,{init_per_group,g_until_fail,[]},ok}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,ok}},
+     {?eh,test_stats,{8,4,{0,0}}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,{failed,{error,{test_case_failed,second_time_fail}}}}},
+     {?eh,test_stats,{8,5,{0,0}}},
+     {?eh,tc_start,{S,{end_per_group,g_until_fail,[]}}},
+     {?eh,tc_done,{S,{end_per_group,g_until_fail,[]},ok}},
+     %% g, parallel, tc1, {repeat,2}
+     {parallel,
+      [{?eh,tc_start,{S,{init_per_group,g,[parallel]}}},
+       {?eh,tc_done,{S,{init_per_group,g,[parallel]},ok}},
+       {?eh,tc_start,{S,tc1}},
+       {?eh,tc_done,{S,tc1,ok}},
+       {?eh,test_stats,{9,5,{0,0}}},
+       {?eh,tc_start,{S,tc1}},
+       {?eh,tc_done,{S,tc1,ok}},
+       {?eh,test_stats,{10,5,{0,0}}},
+       {?eh,tc_start,{S,{end_per_group,g,[parallel]}}},
+       {?eh,tc_done,{S,{end_per_group,g,[parallel]},ok}}]},
+     %% g, sequence, tc1, {repeat,2}
+     {?eh,tc_start,{S,{init_per_group,g,[sequence]}}},
+     {?eh,tc_done,{S,{init_per_group,g,[sequence]},ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{11,5,{0,0}}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{12,5,{0,0}}},
+     {?eh,tc_start,{S,{end_per_group,g,[sequence]}}},
+     {?eh,tc_done,{S,{end_per_group,g,[sequence]},ok}},
+     %% g_sequence_skip_rest, 
+     {?eh,tc_start,{S,{init_per_group,g_mixed,[sequence]}}},
+     {?eh,tc_done,{S,{init_per_group,g_mixed,[sequence]},ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{13,5,{0,0}}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{14,5,{0,0}}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,ok}},
+     {?eh,test_stats,{15,5,{0,0}}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,{failed,{error,{test_case_failed,second_time_fail}}}}},
+     {?eh,test_stats,{15,6,{0,0}}},
+     %% ----> fail in sequence, so skip rest
+     {?eh,tc_auto_skip,{S,{tc4,g_mixed}, % last of current repeat tc4
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,1}}},
+     {?eh,tc_auto_skip,{S,{tc1,g_mixed}, % single tc1
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,2}}},
+     {?eh,tc_auto_skip,{S,{tc1,g}, % group g, tc1, {repeat,2}
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,3}}},
+     {?eh,tc_auto_skip,{S,{tc1,subgroup}, % subgroup, single tc1
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,4}}},
+     {?eh,tc_auto_skip,{S,{tc2,subgroup}, % subgroup, tc2, {repeat,2}
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,5}}},
+     {?eh,tc_auto_skip,{S,{tc2,g_mixed}, % tc2, {repeat,2}
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,6}}},
+     {?eh,tc_auto_skip,{S,{tc2,g_mixed}, % single tc2
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,7}}},
+     {?eh,tc_auto_skip,{S,{tc1,g_mixed}, % tc1, {repeat,2}
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,8}}},
+     {?eh,tc_auto_skip,{S,{tc1,g_mixed}, % single tc1
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,9}}},
+     {?eh,tc_start,{S,{end_per_group,g_mixed,'_'}}},
+     {?eh,tc_done,{S,{end_per_group,g_mixed,'_'},ok}},
+     %% done
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_parallel_until_ok) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_parallel_until_ok,[parallel]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_parallel_until_ok,[parallel]},ok}},
+     {?eh,severe_error,{{illegal_combination,{parallel,repeat_until_ok}},'_'}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_parallel_until_fail) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_parallel_until_fail,[parallel]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_parallel_until_fail,[parallel]},ok}},
+     {?eh,severe_error,{{illegal_combination,{parallel,repeat_until_fail}},'_'}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_sequence_until_ok) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_sequence_until_ok,[sequence]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_sequence_until_ok,[sequence]},ok}},
+     {?eh,severe_error,{{illegal_combination,{sequence,repeat_until_ok}},'_'}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_sequence_until_fail) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_sequence_until_fail,[sequence]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_sequence_until_fail,[sequence]},ok}},
+     {?eh,severe_error,{{illegal_combination,{sequence,repeat_until_fail}},'_'}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(pick_one_test_from_group) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_mixed,[]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_mixed,[]},ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc1}},
+      {?eh,tc_start,{'_',tc2}}}, % single tc2
+     {?eh,tc_done,{'_',tc2,ok}},
+     {?eh,tc_start,{'_',tc2}}, % tc2, {repeat,2}
+     {?eh,tc_done,{'_',tc2,ok}},
+     {?eh,tc_start,{'_',tc2}},
+     {?eh,tc_done,{'_',tc2,ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc1}},
+      {?eh,tc_start,{'_',{end_per_group,g_mixed,[]}}}},
+     {?eh,tc_done,{'_',{end_per_group,g_mixed,[]},ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(pick_one_test_from_subgroup) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_mixed,[]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_mixed,[]},ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc2}},
+      {?eh,tc_start,{'_',{init_per_group,subgroup,[]}}}},
+     {?eh,tc_done,{'_',{init_per_group,subgroup,[]},ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc1}},
+      {?eh,tc_start,{'_',tc2}}}, % tc2, {repeat,2}
+     {?eh,tc_done,{'_',tc2,ok}},
+     {?eh,tc_start,{'_',tc2}},
+     {?eh,tc_done,{'_',tc2,ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc1}},
+      {?eh,tc_start,{'_',{end_per_group,subgroup,[]}}}},
+     {?eh,tc_done,{'_',{end_per_group,subgroup,[]},ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc2}},
+      {?eh,tc_start,{'_',{end_per_group,g_mixed,[]}}}},
+     {?eh,tc_done,{'_',{end_per_group,g_mixed,[]},ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(ok) ->
+    ok.
+
+%% test events help functions
+contains(List) ->
+    fun(Proplist) when is_list(Proplist) ->
+	    contains(List,Proplist)
+    end.
+
+contains([{not_in_order,List}|T],Rest) ->
+    contains_parallel(List,Rest),
+    contains(T,Rest);
+contains([{Ele,Pos}|T] = L,[H|T2]) ->
+    case element(Pos,H) of
+	Ele ->
+	    contains(T,T2);
+	_ ->
+	    contains(L,T2)
+    end;
+contains([Ele|T],[{Ele,_}|T2])->
+    contains(T,T2);
+contains([Ele|T],[Ele|T2])->
+    contains(T,T2);
+contains(List,[_|T]) ->
+    contains(List,T);
+contains([],_) ->
+    match.
+
+contains_parallel([Key | T], Elems) ->
+    contains([Key],Elems),
+    contains_parallel(T,Elems);
+contains_parallel([],_Elems) ->
+    match.
+
+not_contains(List) ->
+    fun(Proplist) when is_list(Proplist) ->
+	    [] = [Ele || {Ele,_} <- Proplist,
+			 Test <- List,
+			 Test =:= Ele]
+    end.
diff --git a/lib/common_test/test/ct_tc_repeat_SUITE_data/tc_repeat_SUITE.erl b/lib/common_test/test/ct_tc_repeat_SUITE_data/tc_repeat_SUITE.erl
new file mode 100644
index 0000000000..f5d960d12f
--- /dev/null
+++ b/lib/common_test/test/ct_tc_repeat_SUITE_data/tc_repeat_SUITE.erl
@@ -0,0 +1,85 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(tc_repeat_SUITE).
+
+-suite_defaults([{timetrap, {minutes, 10}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+init_per_group(_Group,Config) ->
+    Config.
+
+end_per_group(_Group,Config) ->
+    ok.
+
+all() ->
+    [{testcase,tc1,[{repeat,2}]},
+     {testcase,tc2,[{repeat_until_ok,3}]},
+     {testcase,tc3,[{repeat_until_ok,3}]},
+     {testcase,tc4,[{repeat_until_fail,3}]},
+     {group,g},
+     {group,g_until_ok},
+     {group,g_until_fail},
+     {group,g,[parallel]},
+     {group,g,[sequence]},
+     {group,g_mixed,[sequence]}].
+
+groups() ->
+    [{g,[{testcase,tc1,[{repeat,2}]}]},
+     {g_until_ok,[{testcase,tc2,[{repeat_until_ok,3}]}]},
+     {g_until_fail,[{testcase,tc4,[{repeat_until_fail,3}]}]},
+     {g_parallel_until_ok,[parallel],[{testcase,tc2,[{repeat_until_ok,3}]}]},
+     {g_parallel_until_fail,[parallel],[{testcase,tc1,[{repeat_until_fail,2}]}]},
+     {g_sequence_until_ok,[sequence],[{testcase,tc2,[{repeat_until_ok,3}]}]},
+     {g_sequence_until_fail,[sequence],[{testcase,tc1,[{repeat_until_fail,2}]}]},
+     {g_mixed,[{testcase,tc1,[{repeat,2}]},
+               {testcase,tc4,[{repeat,3}]},
+               tc1,
+               {group,g},
+               {subgroup,[tc1,{testcase,tc2,[{repeat,2}]}]},
+               {testcase,tc2,[{repeat,2}]},
+               tc2,
+               {testcase,tc1,[{repeat,2}]},
+               tc1]}].
+
+%% Test cases starts here.
+tc1(_Config) ->
+    ok.
+
+tc2(_Config) ->
+    ok.
+
+tc3(_Config) ->
+    ct:fail(always_fail).
+
+tc4(Config) ->
+    case ?config(saved_config,Config) of
+        {tc4,_} ->
+            ct:fail(second_time_fail);
+        undefined ->
+            {save_config,Config}
+    end.
+
+tc5(_Config) ->
+    {skip,"just skip this"}.