Merge remote branch 'origin/peppe/common_test/otp-9880_9986_9989' into maint

* origin/peppe/common_test/otp-9880_9986_9989:
  Fix error with group config deleted before post_end_per_group
  Introduce new test suite for CTHs
  Fix bug in handling ct_hooks start arguments
  Use calls to ct_framework:init/end_per_suite for configuration
  Change ct_init/end_per_group to init/end_per_group
  Run hooks for non-existing config functions

OTP-9880
OTP-9986
OTP-9989
OTP-9992

7 files changed, 624 insertions, 374 deletions

diff --git a/lib/common_test/test/ct_group_info_SUITE.erl b/lib/common_test/test/ct_group_info_SUITE.erl
index 2da8219196..18016c4979 100644
--- a/lib/common_test/test/ct_group_info_SUITE.erl
+++ b/lib/common_test/test/ct_group_info_SUITE.erl
@@ -440,72 +440,72 @@ test_events(timetrap_all_no_ipg) ->
 
      {?eh,tc_done,{group_timetrap_3_SUITE,t1,{failed,{timetrap_timeout,1000}}}},
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g1,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g1,[{suite,group_timetrap_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g1,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g1,[{suite,group_timetrap_3_SUITE}]},ok}},
       {?eh,tc_done,{group_timetrap_3_SUITE,t11,{failed,{timetrap_timeout,500}}}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g1,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g1,[{suite,group_timetrap_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g1,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g1,[{suite,group_timetrap_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g2,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g2,[{suite,group_timetrap_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g2,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g2,[{suite,group_timetrap_3_SUITE}]},ok}},
       {?eh,tc_done,{group_timetrap_3_SUITE,t21,{failed,{timetrap_timeout,1500}}}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g2,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g2,[{suite,group_timetrap_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g2,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g2,[{suite,group_timetrap_3_SUITE}]},ok}}],
 
      {?eh,tc_done,{group_timetrap_3_SUITE,t2,{failed,{timetrap_timeout,1000}}}},
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g3,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g3,[{suite,group_timetrap_3_SUITE}]},ok}},
-      [{?eh,tc_start,{ct_framework,{ct_init_per_group,g4,[{suite,group_timetrap_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_init_per_group,g4,[{suite,group_timetrap_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g3,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g3,[{suite,group_timetrap_3_SUITE}]},ok}},
+      [{?eh,tc_start,{ct_framework,{init_per_group,g4,[{suite,group_timetrap_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g4,[{suite,group_timetrap_3_SUITE}]},ok}},
        {?eh,tc_done,{group_timetrap_3_SUITE,t41,{failed,{timetrap_timeout,250}}}},
-       {?eh,tc_start,{ct_framework,{ct_end_per_group,g4,[{suite,group_timetrap_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_end_per_group,g4,[{suite,group_timetrap_3_SUITE}]},ok}}],
+       {?eh,tc_start,{ct_framework,{end_per_group,g4,[{suite,group_timetrap_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{end_per_group,g4,[{suite,group_timetrap_3_SUITE}]},ok}}],
       {?eh,tc_done,{group_timetrap_3_SUITE,t31,{failed,{timetrap_timeout,500}}}},
-      [{?eh,tc_start,{ct_framework,{ct_init_per_group,g5,[{suite,group_timetrap_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_init_per_group,g5,[{suite,group_timetrap_3_SUITE}]},ok}},
+      [{?eh,tc_start,{ct_framework,{init_per_group,g5,[{suite,group_timetrap_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g5,[{suite,group_timetrap_3_SUITE}]},ok}},
        {?eh,tc_done,{group_timetrap_3_SUITE,t51,{failed,{timetrap_timeout,1500}}}},
-       {?eh,tc_start,{ct_framework,{ct_end_per_group,g5,[{suite,group_timetrap_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_end_per_group,g5,[{suite,group_timetrap_3_SUITE}]},ok}}],
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g3,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g3,[{suite,group_timetrap_3_SUITE}]},ok}}],
+       {?eh,tc_start,{ct_framework,{end_per_group,g5,[{suite,group_timetrap_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{end_per_group,g5,[{suite,group_timetrap_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g3,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g3,[{suite,group_timetrap_3_SUITE}]},ok}}],
 
      {?eh,tc_done,{group_timetrap_3_SUITE,t3,{failed,{timetrap_timeout,250}}}},
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g6,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g6,[{suite,group_timetrap_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g6,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g6,[{suite,group_timetrap_3_SUITE}]},ok}},
       {?eh,tc_done,{group_timetrap_3_SUITE,t61,{failed,{timetrap_timeout,500}}}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g6,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g6,[{suite,group_timetrap_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g6,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g6,[{suite,group_timetrap_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g7,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g7,[{suite,group_timetrap_3_SUITE}]},ok}},
-      [{?eh,tc_start,{ct_framework,{ct_init_per_group,g8,[{suite,group_timetrap_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_init_per_group,g8,[{suite,group_timetrap_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g7,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g7,[{suite,group_timetrap_3_SUITE}]},ok}},
+      [{?eh,tc_start,{ct_framework,{init_per_group,g8,[{suite,group_timetrap_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g8,[{suite,group_timetrap_3_SUITE}]},ok}},
        {?eh,tc_done,{group_timetrap_3_SUITE,t81,{failed,{timetrap_timeout,750}}}},
-       {?eh,tc_start,{ct_framework,{ct_end_per_group,g8,[{suite,group_timetrap_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_end_per_group,g8,[{suite,group_timetrap_3_SUITE}]},ok}}],
+       {?eh,tc_start,{ct_framework,{end_per_group,g8,[{suite,group_timetrap_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{end_per_group,g8,[{suite,group_timetrap_3_SUITE}]},ok}}],
       {?eh,tc_done,{group_timetrap_3_SUITE,t71,{failed,{timetrap_timeout,500}}}},
-      [{?eh,tc_start,{ct_framework,{ct_init_per_group,g9,[{suite,group_timetrap_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_init_per_group,g9,[{suite,group_timetrap_3_SUITE}]},ok}},
+      [{?eh,tc_start,{ct_framework,{init_per_group,g9,[{suite,group_timetrap_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g9,[{suite,group_timetrap_3_SUITE}]},ok}},
        {?eh,tc_done,{group_timetrap_3_SUITE,t91,{failed,{timetrap_timeout,250}}}},
-       {?eh,tc_start,{ct_framework,{ct_end_per_group,g9,[{suite,group_timetrap_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_end_per_group,g9,[{suite,group_timetrap_3_SUITE}]},ok}}],
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g7,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g7,[{suite,group_timetrap_3_SUITE}]},ok}}],
+       {?eh,tc_start,{ct_framework,{end_per_group,g9,[{suite,group_timetrap_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{end_per_group,g9,[{suite,group_timetrap_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g7,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g7,[{suite,group_timetrap_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g10,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g10,[{suite,group_timetrap_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g10,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g10,[{suite,group_timetrap_3_SUITE}]},ok}},
       {?eh,tc_done,{group_timetrap_3_SUITE,t101,{failed,{timetrap_timeout,1000}}}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g10,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g10,[{suite,group_timetrap_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g10,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g10,[{suite,group_timetrap_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g11,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g11,[{suite,group_timetrap_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g11,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g11,[{suite,group_timetrap_3_SUITE}]},ok}},
       {?eh,tc_done,{group_timetrap_3_SUITE,t111,{failed,{timetrap_timeout,1000}}}},
       {?eh,test_stats,{0,14,{0,0}}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g11,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g11,[{suite,group_timetrap_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g11,[{suite,group_timetrap_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g11,[{suite,group_timetrap_3_SUITE}]},ok}}],
 
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
@@ -779,78 +779,78 @@ test_events(require_no_ipg) ->
      {?eh,start_info,{1,1,13}},
      {?eh,tc_done,{group_require_3_SUITE,t1,ok}},
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g1,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g1,[{suite,group_require_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g1,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g1,[{suite,group_require_3_SUITE}]},ok}},
       {?eh,tc_done,{group_require_3_SUITE,t11,ok}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g1,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g1,[{suite,group_require_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g1,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g1,[{suite,group_require_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g2,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g2,[{suite,group_require_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g2,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g2,[{suite,group_require_3_SUITE}]},ok}},
       {?eh,tc_done,{group_require_3_SUITE,t21,ok}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g2,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g2,[{suite,group_require_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g2,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g2,[{suite,group_require_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g3,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g3,[{suite,group_require_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g3,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g3,[{suite,group_require_3_SUITE}]},ok}},
       {?eh,tc_done,{group_require_3_SUITE,t31,ok}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g3,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g3,[{suite,group_require_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g3,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g3,[{suite,group_require_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g4,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g4,[{suite,group_require_3_SUITE}]},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g4,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g4,[{suite,group_require_3_SUITE}]},
 	{skipped,{require_failed,{name_in_use,common2_alias,common2}}}}},
       {?eh,tc_auto_skip,{group_require_3_SUITE,t41,
 			 {require_failed,{name_in_use,common2_alias,common2}}}},
       {?eh,test_stats,{4,0,{0,1}}},
-      {?eh,tc_auto_skip,{ct_framework,ct_end_per_group,
+      {?eh,tc_auto_skip,{ct_framework,end_per_group,
 			 {require_failed,{name_in_use,common2_alias,common2}}}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g5,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g5,[{suite,group_require_3_SUITE}]},ok}},
-      [{?eh,tc_start,{ct_framework,{ct_init_per_group,g6,[{suite,group_require_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_init_per_group,g6,[{suite,group_require_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g5,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g5,[{suite,group_require_3_SUITE}]},ok}},
+      [{?eh,tc_start,{ct_framework,{init_per_group,g6,[{suite,group_require_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g6,[{suite,group_require_3_SUITE}]},ok}},
        {?eh,tc_done,{group_require_3_SUITE,t61,ok}},
-       {?eh,tc_start,{ct_framework,{ct_end_per_group,g6,[{suite,group_require_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_end_per_group,g6,[{suite,group_require_3_SUITE}]},ok}}],
+       {?eh,tc_start,{ct_framework,{end_per_group,g6,[{suite,group_require_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{end_per_group,g6,[{suite,group_require_3_SUITE}]},ok}}],
       {?eh,tc_done,{group_require_3_SUITE,t51,ok}},
-      [{?eh,tc_start,{ct_framework,{ct_init_per_group,g7,[{suite,group_require_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_init_per_group,g7,[{suite,group_require_3_SUITE}]},ok}},
+      [{?eh,tc_start,{ct_framework,{init_per_group,g7,[{suite,group_require_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g7,[{suite,group_require_3_SUITE}]},ok}},
        {?eh,tc_done,{group_require_3_SUITE,t71,ok}},
        {?eh,tc_done,{group_require_3_SUITE,t72,ok}},
-       {?eh,tc_start,{ct_framework,{ct_end_per_group,g7,[{suite,group_require_3_SUITE}]}}},
-       {?eh,tc_done,{ct_framework,{ct_end_per_group,g7,[{suite,group_require_3_SUITE}]},ok}}],
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g5,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g5,[{suite,group_require_3_SUITE}]},ok}}],
+       {?eh,tc_start,{ct_framework,{end_per_group,g7,[{suite,group_require_3_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{end_per_group,g7,[{suite,group_require_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g5,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g5,[{suite,group_require_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g8,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g8,[{suite,group_require_3_SUITE}]},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g8,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g8,[{suite,group_require_3_SUITE}]},
 		    {skipped,{require_failed,{not_available,non_existing}}}}},
       {?eh,tc_auto_skip,{group_require_3_SUITE,t81,
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
-      {?eh,tc_auto_skip,{ct_framework,ct_end_per_group,
+      {?eh,tc_auto_skip,{ct_framework,end_per_group,
 			 {require_failed,{not_available,non_existing}}}}],
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g9,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g9,[{suite,group_require_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g9,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g9,[{suite,group_require_3_SUITE}]},ok}},
       {?eh,tc_done,{group_require_3_SUITE,t91,
 		    {skipped,{require_failed,{not_available,non_existing}}}}},
       {?eh,test_stats,{8,0,{0,3}}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g9,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g9,[{suite,group_require_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g9,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g9,[{suite,group_require_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g10,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g10,[{suite,group_require_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g10,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g10,[{suite,group_require_3_SUITE}]},ok}},
       {?eh,tc_done,{group_require_3_SUITE,t101,ok}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g10,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g10,[{suite,group_require_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g10,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g10,[{suite,group_require_3_SUITE}]},ok}}],
 
-     [{?eh,tc_start,{ct_framework,{ct_init_per_group,g11,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_init_per_group,g11,[{suite,group_require_3_SUITE}]},ok}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,g11,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g11,[{suite,group_require_3_SUITE}]},ok}},
       {?eh,tc_done,{group_require_3_SUITE,t111,ok}},
       {?eh,test_stats,{10,0,{0,3}}},
-      {?eh,tc_start,{ct_framework,{ct_end_per_group,g11,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{ct_end_per_group,g11,[{suite,group_require_3_SUITE}]},ok}}],
+      {?eh,tc_start,{ct_framework,{end_per_group,g11,[{suite,group_require_3_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g11,[{suite,group_require_3_SUITE}]},ok}}],
 
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl
index 2392b0b850..c3601ba0ce 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl
@@ -171,16 +171,16 @@ test_events(missing_conf) ->
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,start_info,{1,1,2}},
-     {?eh,tc_start,{ct_framework,{ct_init_per_group,group1,[]}}},
-     {?eh,tc_done,{ct_framework,{ct_init_per_group,group1,[]},ok}},
+     {?eh,tc_start,{ct_framework,{init_per_group,group1,[]}}},
+     {?eh,tc_done,{ct_framework,{init_per_group,group1,[]},ok}},
      {?eh,tc_start,{missing_conf_SUITE,tc1}},
      {?eh,tc_done,{missing_conf_SUITE,tc1,ok}},
      {?eh,test_stats,{1,0,{0,0}}},
      {?eh,tc_start,{missing_conf_SUITE,tc2}},
      {?eh,tc_done,{missing_conf_SUITE,tc2,ok}},
      {?eh,test_stats,{2,0,{0,0}}},
-     {?eh,tc_start,{ct_framework,{ct_end_per_group,group1,[]}}},
-     {?eh,tc_done,{ct_framework,{ct_end_per_group,group1,[]},ok}},
+     {?eh,tc_start,{ct_framework,{end_per_group,group1,[]}}},
+     {?eh,tc_done,{ct_framework,{end_per_group,group1,[]},ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 2c519f08b5..efe57a7d0b 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -83,10 +83,9 @@ all(suite) ->
        fail_post_suite_cth, skip_pre_suite_cth,
        skip_post_suite_cth, recover_post_suite_cth, update_config_cth,
        state_update_cth, options_cth, same_id_cth, 
-       fail_n_skip_with_minimal_cth, prio_cth
+       fail_n_skip_with_minimal_cth, prio_cth, no_config
       ]
-    )
-	.
+    ).
 
 
 %%--------------------------------------------------------------------
@@ -214,6 +213,10 @@ prio_cth(Config) when is_list(Config) ->
 	    [{empty_cth,[1000],1000},{empty_cth,[900],900},
 	     {prio_cth,[1100,100],100},{prio_cth,[1100]}],Config).
 
+no_config(Config) when is_list(Config) ->
+    do_test(no_config, "ct_no_config_SUITE.erl",
+	    [verify_config_cth],Config).
+
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
@@ -1078,6 +1081,56 @@ test_events(prio_cth) ->
 	 {?eh,test_done,{'DEF','STOP_TIME'}},
 	 {?eh,stop_logging,[]}];
 
+test_events(no_config) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,init,[verify_config_cth,[]]}},
+     {?eh,start_info,{1,1,2}},
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,cth,{empty_cth,pre_init_per_suite,
+	       [ct_no_config_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_init_per_suite,
+	       [ct_no_config_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,tc_done,{ct_framework,init_per_suite,ok}},
+     {?eh,tc_start,{ct_no_config_SUITE,test_case_1}},
+     {?eh,cth,{empty_cth,pre_init_per_testcase,
+	       [test_case_1,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_testcase,
+	       [test_case_1,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_no_config_SUITE,test_case_1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     [{?eh,tc_start,{ct_framework,{init_per_group,test_group,'$proplist'}}},
+      {?eh,cth,{empty_cth,pre_init_per_group,
+		[test_group,'$proplist',[]]}},
+      {?eh,cth,{empty_cth,post_init_per_group,
+		[test_group,'$proplist','$proplist',[]]}},
+      {?eh,tc_done,{ct_framework,
+		    {init_per_group,test_group,'$proplist'},ok}},
+      {?eh,tc_start,{ct_no_config_SUITE,test_case_2}},
+      {?eh,cth,{empty_cth,pre_init_per_testcase,
+		[test_case_2,'$proplist',[]]}},
+      {?eh,cth,{empty_cth,post_end_per_testcase,
+		[test_case_2,'$proplist',ok,[]]}},
+      {?eh,tc_done,{ct_no_config_SUITE,test_case_2,ok}},
+      {?eh,test_stats,{2,0,{0,0}}},
+      {?eh,tc_start,{ct_framework,{end_per_group,test_group,'$proplist'}}},
+      {?eh,cth,{empty_cth,pre_end_per_group,
+		[test_group,'$proplist',[]]}},
+      {?eh,cth,{empty_cth,post_end_per_group,
+		[test_group,'$proplist',ok,[]]}},
+      {?eh,tc_done,{ct_framework,{end_per_group,test_group,'$proplist'},ok}}],
+     {?eh,tc_start,{ct_framework,end_per_suite}},
+     {?eh,cth,{empty_cth,pre_end_per_suite,
+	       [ct_no_config_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_suite,
+	       [ct_no_config_SUITE,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_framework,end_per_suite,ok}},
+     {?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/ct_no_config_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_config_SUITE.erl
new file mode 100644
index 0000000000..2ad80aa1e7
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_config_SUITE.erl
@@ -0,0 +1,64 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

+%%

+%% The contents of this file are subject to the Erlang Public License,

+%% Version 1.1, (the "License"); you may not use this file except in

+%% compliance with the License. You should have received a copy of the

+%% Erlang Public License along with this software. If not, it can be

+%% retrieved online at http://www.erlang.org/.

+%%

+%% Software distributed under the License is distributed on an "AS IS"

+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

+%% the License for the specific language governing rights and limitations

+%% under the License.

+%%

+%% %CopyrightEnd%

+%%

+

+-module(ct_no_config_SUITE).

+

+%% Note: This directive should only be used in test suites.

+-compile(export_all).

+

+-include("ct.hrl").

+

+%%% This suite is used to verify 2 things:

+%%%

+%%% 1) All hook pre/post functions get called, even if no init/end

+%%%    config functions exist in the suite (new from ver 1.6.1, R15B01).

+%%%

+%%% 2) The hook functions can read Config list elements, as well as

+%%%    required config variables, even if no init/end config

+%%%    functions exist. 

+

+suite() ->

+    [{timetrap, {seconds,1}},

+     {ct_hooks, [verify_config_cth]},

+     {require,suite_cfg},

+     {default_config,suite_cfg,?MODULE}].

+

+group(test_group) ->

+    [{require,group_cfg},

+     {default_config,group_cfg,test_group}].

+

+test_case_1() ->    

+    [{require,test_case_1_cfg},

+     {default_config,test_case_1_cfg,test_case_1}].    

+

+test_case_2() ->    

+    [{require,test_case_2_cfg},

+     {default_config,test_case_2_cfg,test_case_2}].    

+

+all() ->

+    [test_case_1, {group,test_group}].

+

+groups() ->

+    [{test_group,[],[test_case_2]}].

+

+test_case_1(Config) ->

+    ok.

+

+test_case_2(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 7befcfa57c..2529e806ea 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
@@ -1,277 +1,277 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

-%% The contents of this file are subject to the Erlang Public License,

-%% Version 1.1, (the "License"); you may not use this file except in

-%% compliance with the License. You should have received a copy of the

-%% Erlang Public License along with this software. If not, it can be

-%% retrieved online at http://www.erlang.org/.

-%%

-%% Software distributed under the License is distributed on an "AS IS"

-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

-%% the License for the specific language governing rights and limitations

-%% under the License.

-%%

-%% %CopyrightEnd%

-%%

-

-%%% @doc Common Test Example Suite Callback module.

-%%%

-%%% <p>This module gives an example of a common test CTH (Common Test Hook).

-%%% There are many ways to add a CTH to a test run, you can do it either in

-%%% the command line using -ct_hook, in a test spec using

-%%% {ct_hook,M} or in the suite it self by returning ct_hook

-%%% from either suite/0, init_per_suite/1, init_per_group/2 and

-%%% init_per_testcase/2. The scope of the CTH is determined by where is it

-%%% started. If it is started in the command line or test spec then it will

-%%% be stopped at the end of all tests. If it is started in init_per_suite,

-%%% it will be stopped after end_per_suite and so on. See terminate

-%%% documentation for a table describing the scoping machanics. 

-%%%

-%%% All of callbacks except init/1 in a CTH are optional.</p>

-

--module(empty_cth).

-

-%% CT Hooks

--export([id/1]).

--export([init/2]).

-

--export([pre_init_per_suite/3]).

--export([post_init_per_suite/4]).

--export([pre_end_per_suite/3]).

--export([post_end_per_suite/4]).

-

--export([pre_init_per_group/3]).

--export([post_init_per_group/4]).

--export([pre_end_per_group/3]).

--export([post_end_per_group/4]).

-

--export([pre_init_per_testcase/3]).

--export([post_end_per_testcase/4]).

-

--export([on_tc_fail/3]).

--export([on_tc_skip/3]).

-

--export([terminate/1]).

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%% @doc Common Test Example Suite Callback module.
+%%%
+%%% <p>This module gives an example of a common test CTH (Common Test Hook).
+%%% There are many ways to add a CTH to a test run, you can do it either in
+%%% the command line using -ct_hook, in a test spec using
+%%% {ct_hook,M} or in the suite it self by returning ct_hook
+%%% from either suite/0, init_per_suite/1, init_per_group/2 and
+%%% init_per_testcase/2. The scope of the CTH is determined by where is it
+%%% started. If it is started in the command line or test spec then it will
+%%% be stopped at the end of all tests. If it is started in init_per_suite,
+%%% it will be stopped after end_per_suite and so on. See terminate
+%%% documentation for a table describing the scoping machanics. 
+%%%
+%%% All of callbacks except init/1 in a CTH are optional.</p>
+
+-module(empty_cth).
+
+%% CT Hooks
+-export([id/1]).
+-export([init/2]).
+
+-export([pre_init_per_suite/3]).
+-export([post_init_per_suite/4]).
+-export([pre_end_per_suite/3]).
+-export([post_end_per_suite/4]).
+
+-export([pre_init_per_group/3]).
+-export([post_init_per_group/4]).
+-export([pre_end_per_group/3]).
+-export([post_end_per_group/4]).
+
+-export([pre_init_per_testcase/3]).
+-export([post_end_per_testcase/4]).
+
+-export([on_tc_fail/3]).
+-export([on_tc_skip/3]).
+
+-export([terminate/1]).
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
 -type config() :: proplists:proplist().
--type reason() :: term().

--type skip_or_fail() :: {skip, reason()} |

-                        {auto_skip, reason()} |

-                        {fail, reason()} | 

-			{'EXIT',reason()}.

-

--record(state, { id = ?MODULE :: term()}).

-

-%% @doc Always called before any other callback function. Use this to initiate

-%% any common state. It should return an state for this CTH.

+-type reason() :: term().
+-type skip_or_fail() :: {skip, reason()} |
+                        {auto_skip, reason()} |
+                        {fail, reason()} | 
+			{'EXIT',reason()}.
+
+-record(state, { id = ?MODULE :: term()}).
+
+%% @doc 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()) ->
-    {ok, State :: #state{}}.

-init(Id, Opts) ->

-    gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),

-					    data = {?MODULE, init, [Id, Opts]}}),

-    {ok,Opts}.

-

-%% @doc The ID is used to uniquly identify an CTH instance, if two CTH's 

-%% return the same ID the seconds CTH is ignored. This function should NOT 

-%% have any side effects as it might be called multiple times by common test.

+    {ok, State :: #state{}}.
+init(Id, Opts) ->
+    gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),
+					    data = {?MODULE, init, [Id, Opts]}}),
+    {ok,Opts}.
+
+%% @doc The ID is used to uniquly identify an CTH instance, if two CTH's 
+%% return the same ID the seconds CTH is ignored. This function should NOT 
+%% have any side effects as it might be called multiple times by common test.
 -spec id(Opts :: proplists:proplist()) ->
-    Id :: term().

-id(Opts) ->

-    gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),

-					    data = {?MODULE, id, [Opts]}}),

-    now().

-

-%% @doc Called before init_per_suite is called. Note that this callback is

-%% only called if the CTH is added before init_per_suite is run (eg. in a test

-%% specification, suite/0 function etc).

-%% You can change the config in the this function.

--spec pre_init_per_suite(Suite :: atom(),

-		     Config :: config(),

-		     State :: #state{}) ->

-    {config() | skip_or_fail(), NewState :: #state{}}.

-pre_init_per_suite(Suite,Config,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, pre_init_per_suite,

-				     [Suite,Config,State]}}),

-    {Config, State}.

-

-%% @doc Called after init_per_suite.

-%% you can change the return value in this function.

--spec post_init_per_suite(Suite :: atom(),

-			  Config :: config(),

-			  Return :: config() | skip_or_fail(),

-			  State :: #state{}) ->

-    {config() | skip_or_fail(), NewState :: #state{}}.

-post_init_per_suite(Suite,Config,Return,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, post_init_per_suite,

-				     [Suite,Config,Return,State]}}),

-    {Return, State}.

-

-%% @doc Called before end_per_suite. The config/state can be changed here,

-%% though it will only affect the *end_per_suite function.

--spec pre_end_per_suite(Suite :: atom(),

-		    Config :: config() | skip_or_fail(),

-		    State :: #state{}) ->

-    {ok | skip_or_fail(), NewState :: #state{}}.

-pre_end_per_suite(Suite,Config,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, pre_end_per_suite,

-				     [Suite,Config,State]}}),

-    {Config, State}.

-

-%% @doc Called after end_per_suite. Note that the config cannot be

-%% changed here, only the status of the suite.

--spec post_end_per_suite(Suite :: atom(),

-			 Config :: config(),

-			 Return :: term(),

-			 State :: #state{}) ->

-    {ok | skip_or_fail(), NewState :: #state{}}.

-post_end_per_suite(Suite,Config,Return,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, post_end_per_suite,

-				     [Suite,Config,Return,State]}}),

-    {Return, State}.

-

-%% @doc Called before each init_per_group.

-%% You can change the config in this function.

--spec pre_init_per_group(Group :: atom(),

-		     Config :: config(),

-		     State :: #state{}) ->

-    {config() | skip_or_fail(), NewState :: #state{}}.

-pre_init_per_group(Group,Config,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, pre_init_per_group,

-				     [Group,Config,State]}}),

-    {Config, State}.

-

-%% @doc Called after each init_per_group.

-%% You can change the return value in this function.

--spec post_init_per_group(Group :: atom(),

-			  Config :: config(),

-			  Return :: config() | skip_or_fail(),

-			  State :: #state{}) ->

-    {config() | skip_or_fail(), NewState :: #state{}}.

-post_init_per_group(Group,Config,Return,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, post_init_per_group,

-				     [Group,Config,Return,State]}}),

-    {Return, State}.

-

-%% @doc Called after each end_per_group. The config/state can be changed here,

-%% though it will only affect the *end_per_group functions.

--spec pre_end_per_group(Group :: atom(),

-			Config :: config() | skip_or_fail(),

-			State :: #state{}) ->

-    {ok | skip_or_fail(), NewState :: #state{}}.

-pre_end_per_group(Group,Config,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, pre_end_per_group,

-				     [Group,Config,State]}}),

-    {Config, State}.

-

-%% @doc Called after each end_per_group. Note that the config cannot be

-%% changed here, only the status of the group.

--spec post_end_per_group(Group :: atom(),

-			 Config :: config(),

-			 Return :: term(),

-			 State :: #state{}) ->

-    {ok | skip_or_fail(), NewState :: #state{}}.

-post_end_per_group(Group,Config,Return,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, post_end_per_group,

-				     [Group,Config,Return,State]}}),

-    {Return, State}.

-

-%% @doc Called before each test case.

-%% You can change the config in this function.

--spec pre_init_per_testcase(TC :: atom(),

-		  Config :: config(),

-		  State :: #state{}) ->

-    {config() | skip_or_fail(), NewState :: #state{}}.

-pre_init_per_testcase(TC,Config,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, pre_init_per_testcase,

-				     [TC,Config,State]}}),

-    {Config, State}.

-

-%% @doc Called after each test case. Note that the config cannot be

-%% changed here, only the status of the test case.

--spec post_end_per_testcase(TC :: atom(),

-			    Config :: config(),

-			    Return :: term(),

-			    State :: #state{}) ->

-    {ok | skip_or_fail(), NewState :: #state{}}.

-post_end_per_testcase(TC,Config,Return,State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, post_end_per_testcase,

-				     [TC,Config,Return,State]}}),

-    {Return, State}.

-

-%% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,

-%% post_end_per_group and post_end_per_tc if the suite, group or test case failed.

-%% This function should be used for extra cleanup which might be needed.

-%% It is not possible to modify the config or the status of the test run.

--spec on_tc_fail(TC :: init_per_suite | end_per_suite |

-		 init_per_group | end_per_group | atom(),

-		 Reason :: term(), State :: #state{}) ->

-    NewState :: #state{}.

-on_tc_fail(TC, Reason, State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, on_tc_fail,

-				     [TC,Reason,State]}}),

-    State.

-

-%% @doc Called when a test case is skipped by either user action

-%% or due to an init function failing. Test case can be

-%% end_per_suite, init_per_group, end_per_group and the actual test cases. 

--spec on_tc_skip(TC :: end_per_suite |

-		 init_per_group | end_per_group | atom(),

-		 {tc_auto_skip, {failed, {Mod :: atom(), Function :: atom(), Reason :: term()}}} |

-         {tc_user_skip, {skipped, Reason :: term()}},

-          State :: #state{}) ->

-    NewState :: #state{}.

-on_tc_skip(TC, Reason, State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, on_tc_skip,

-				     [TC,Reason,State]}}),

-    State.

-

-%% @doc Called when the scope of the CTH is done, this depends on

-%% when the CTH was specified. This translation table describes when this

-%% function is called.

-%%

-%%  | Started in          |     terminate called    |

-%%  |---------------------|-------------------------|

-%%  | command_line        | after all tests are run |

-%%  | test spec           | after all tests are run |

-%%  | suite/0             | after SUITE is done     |

-%%  | init_per_suite/1    | after SUITE is done     |

-%%  | init_per_group/2    | after group is done     |

-%%  |-----------------------------------------------|

-%%

--spec terminate(State :: #state{}) ->

-    term().

-terminate(State) ->

-    gen_event:notify(

-      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

-			     data = {?MODULE, terminate, [State]}}),

-    ok.

+    Id :: term().
+id(Opts) ->
+    gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),
+					    data = {?MODULE, id, [Opts]}}),
+    now().
+
+%% @doc Called before init_per_suite is called. Note that this callback is
+%% only called if the CTH is added before init_per_suite is run (eg. in a test
+%% specification, suite/0 function etc).
+%% You can change the config in the this function.
+-spec pre_init_per_suite(Suite :: atom(),
+		     Config :: config(),
+		     State :: #state{}) ->
+    {config() | skip_or_fail(), NewState :: #state{}}.
+pre_init_per_suite(Suite,Config,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, pre_init_per_suite,
+				     [Suite,Config,State]}}),
+    {Config, State}.
+
+%% @doc Called after init_per_suite.
+%% you can change the return value in this function.
+-spec post_init_per_suite(Suite :: atom(),
+			  Config :: config(),
+			  Return :: config() | skip_or_fail(),
+			  State :: #state{}) ->
+    {config() | skip_or_fail(), NewState :: #state{}}.
+post_init_per_suite(Suite,Config,Return,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_init_per_suite,
+				     [Suite,Config,Return,State]}}),
+    {Return, State}.
+
+%% @doc Called before end_per_suite. The config/state can be changed here,
+%% though it will only affect the *end_per_suite function.
+-spec pre_end_per_suite(Suite :: atom(),
+		    Config :: config() | skip_or_fail(),
+		    State :: #state{}) ->
+    {ok | skip_or_fail(), NewState :: #state{}}.
+pre_end_per_suite(Suite,Config,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, pre_end_per_suite,
+				     [Suite,Config,State]}}),
+    {Config, State}.
+
+%% @doc Called after end_per_suite. Note that the config cannot be
+%% changed here, only the status of the suite.
+-spec post_end_per_suite(Suite :: atom(),
+			 Config :: config(),
+			 Return :: term(),
+			 State :: #state{}) ->
+    {ok | skip_or_fail(), NewState :: #state{}}.
+post_end_per_suite(Suite,Config,Return,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_end_per_suite,
+				     [Suite,Config,Return,State]}}),
+    {Return, State}.
+
+%% @doc Called before each init_per_group.
+%% You can change the config in this function.
+-spec pre_init_per_group(Group :: atom(),
+		     Config :: config(),
+		     State :: #state{}) ->
+    {config() | skip_or_fail(), NewState :: #state{}}.
+pre_init_per_group(Group,Config,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, pre_init_per_group,
+				     [Group,Config,State]}}),
+    {Config, State}.
+
+%% @doc Called after each init_per_group.
+%% You can change the return value in this function.
+-spec post_init_per_group(Group :: atom(),
+			  Config :: config(),
+			  Return :: config() | skip_or_fail(),
+			  State :: #state{}) ->
+    {config() | skip_or_fail(), NewState :: #state{}}.
+post_init_per_group(Group,Config,Return,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_init_per_group,
+				     [Group,Config,Return,State]}}),
+    {Return, State}.
+
+%% @doc Called after each end_per_group. The config/state can be changed here,
+%% though it will only affect the *end_per_group functions.
+-spec pre_end_per_group(Group :: atom(),
+			Config :: config() | skip_or_fail(),
+			State :: #state{}) ->
+    {ok | skip_or_fail(), NewState :: #state{}}.
+pre_end_per_group(Group,Config,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, pre_end_per_group,
+				     [Group,Config,State]}}),
+    {Config, State}.
+
+%% @doc Called after each end_per_group. Note that the config cannot be
+%% changed here, only the status of the group.
+-spec post_end_per_group(Group :: atom(),
+			 Config :: config(),
+			 Return :: term(),
+			 State :: #state{}) ->
+    {ok | skip_or_fail(), NewState :: #state{}}.
+post_end_per_group(Group,Config,Return,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_end_per_group,
+				     [Group,Config,Return,State]}}),
+    {Return, State}.
+
+%% @doc Called before each test case.
+%% You can change the config in this function.
+-spec pre_init_per_testcase(TC :: atom(),
+		  Config :: config(),
+		  State :: #state{}) ->
+    {config() | skip_or_fail(), NewState :: #state{}}.
+pre_init_per_testcase(TC,Config,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, pre_init_per_testcase,
+				     [TC,Config,State]}}),
+    {Config, State}.
+
+%% @doc Called after each test case. Note that the config cannot be
+%% changed here, only the status of the test case.
+-spec post_end_per_testcase(TC :: atom(),
+			    Config :: config(),
+			    Return :: term(),
+			    State :: #state{}) ->
+    {ok | skip_or_fail(), NewState :: #state{}}.
+post_end_per_testcase(TC,Config,Return,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_end_per_testcase,
+				     [TC,Config,Return,State]}}),
+    {Return, State}.
+
+%% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
+%% post_end_per_group and post_end_per_tc if the suite, group or test case failed.
+%% This function should be used for extra cleanup which might be needed.
+%% It is not possible to modify the config or the status of the test run.
+-spec on_tc_fail(TC :: init_per_suite | end_per_suite |
+		 init_per_group | end_per_group | atom(),
+		 Reason :: term(), State :: #state{}) ->
+    NewState :: #state{}.
+on_tc_fail(TC, Reason, State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, on_tc_fail,
+				     [TC,Reason,State]}}),
+    State.
+
+%% @doc Called when a test case is skipped by either user action
+%% or due to an init function failing. Test case can be
+%% end_per_suite, init_per_group, end_per_group and the actual test cases. 
+-spec on_tc_skip(TC :: end_per_suite |
+		 init_per_group | end_per_group | atom(),
+		 {tc_auto_skip, {failed, {Mod :: atom(), Function :: atom(), Reason :: term()}}} |
+         {tc_user_skip, {skipped, Reason :: term()}},
+          State :: #state{}) ->
+    NewState :: #state{}.
+on_tc_skip(TC, Reason, State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, on_tc_skip,
+				     [TC,Reason,State]}}),
+    State.
+
+%% @doc Called when the scope of the CTH is done, this depends on
+%% when the CTH was specified. This translation table describes when this
+%% function is called.
+%%
+%%  | Started in          |     terminate called    |
+%%  |---------------------|-------------------------|
+%%  | command_line        | after all tests are run |
+%%  | test spec           | after all tests are run |
+%%  | suite/0             | after SUITE is done     |
+%%  | init_per_suite/1    | after SUITE is done     |
+%%  | init_per_group/2    | after group is done     |
+%%  |-----------------------------------------------|
+%%
+-spec terminate(State :: #state{}) ->
+    term().
+terminate(State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, terminate, [State]}}),
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_config_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_config_cth.erl
new file mode 100644
index 0000000000..99ea261e14
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_config_cth.erl
@@ -0,0 +1,130 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

+%%

+%% The contents of this file are subject to the Erlang Public License,

+%% Version 1.1, (the "License"); you may not use this file except in

+%% compliance with the License. You should have received a copy of the

+%% Erlang Public License along with this software. If not, it can be

+%% retrieved online at http://www.erlang.org/.

+%%

+%% Software distributed under the License is distributed on an "AS IS"

+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

+%% the License for the specific language governing rights and limitations

+%% under the License.

+%%

+%% %CopyrightEnd%

+%%

+

+-module(verify_config_cth).

+

+-include_lib("common_test/src/ct_util.hrl").

+

+%% CT Hooks

+-compile(export_all).

+

+-define(val(K, L), proplists:get_value(K, L)).

+

+id(Opts) ->

+    ?MODULE.

+

+init(Id, Opts) ->

+    {ok, State} = empty_cth:init(Id, Opts),

+    {ok, State}.

+

+pre_init_per_suite(Suite, Config, State) ->

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    empty_cth:pre_init_per_suite(Suite,

+				 [{pre_init_per_suite,true} | Config],

+				 State).

+

+post_init_per_suite(Suite,Config,Return,State) ->

+    true = ?val(pre_init_per_suite, Return),

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    empty_cth:post_init_per_suite(Suite,

+				  Config,

+				  [{post_init_per_suite,true} | Return],

+				  State).

+

+pre_end_per_suite(Suite,Config,State) ->

+    true = ?val(post_init_per_suite, Config),

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    empty_cth:pre_end_per_suite(Suite,

+				[{pre_end_per_suite,true} | Config],

+				State).

+

+post_end_per_suite(Suite,Config,Return,State) ->

+    true = ?val(pre_end_per_suite, Config),

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    empty_cth:post_end_per_suite(Suite,Config,Return,State).

+

+pre_init_per_group(Group,Config,State) ->

+    true = ?val(post_init_per_suite, Config),

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    test_group = ct:get_config(group_cfg),

+    empty_cth:pre_init_per_group(Group,

+				 [{pre_init_per_group,true} | Config],

+				 State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    true = ?val(pre_init_per_group, Return),

+    test_group = ct:get_config(group_cfg),

+    empty_cth:post_init_per_group(Group,

+				  Config,

+				  [{post_init_per_group,true} | Return],

+				  State).

+

+pre_end_per_group(Group,Config,State) ->

+    true = ?val(post_init_per_group, Config),

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    test_group = ct:get_config(group_cfg),

+    empty_cth:pre_end_per_group(Group,

+				[{pre_end_per_group,true} | Config],

+				State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    true = ?val(pre_end_per_group, Config),

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    test_group = ct:get_config(group_cfg),

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    true = ?val(post_init_per_suite, Config),

+    case ?val(name, ?val(tc_group_properties, Config)) of

+	undefined -> 

+	    ok;

+	_ ->

+	    true = ?val(post_init_per_group, Config),

+	    test_group = ct:get_config(group_cfg)

+    end,

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    CfgKey = list_to_atom(atom_to_list(TC) ++ "_cfg"),

+    TC = ct:get_config(CfgKey),

+    empty_cth:pre_init_per_testcase(TC,

+				    [{pre_init_per_testcase,true} | Config],

+				    State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    true = ?val(post_init_per_suite, Config),

+    true = ?val(pre_init_per_testcase, Config),

+    case ?val(name, ?val(tc_group_properties, Config)) of

+	undefined -> 

+	    ok;

+	_ ->

+	    true = ?val(post_init_per_group, Config),	    

+	    test_group = ct:get_config(group_cfg)

+    end,

+    ct_no_config_SUITE = ct:get_config(suite_cfg),

+    CfgKey = list_to_atom(atom_to_list(TC) ++ "_cfg"),

+    TC = ct:get_config(CfgKey),

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
index efc0309781..8825d84884 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
@@ -242,25 +242,28 @@ test_events(ts_if_1) ->
      {?eh,tc_auto_skip,{ts_if_5_SUITE,end_per_suite,
 			{require_failed_in_suite0,{not_available,undef_variable}}}},
 
-     {?eh,tc_start,{ts_if_6_SUITE,tc1}},
-     {?eh,tc_done,{ts_if_6_SUITE,tc1,{failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
-     {?eh,test_stats,{3,5,{6,8}}},
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,tc_done,{ct_framework,init_per_suite,
+		   {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
+     {?eh,tc_auto_skip,{ts_if_6_SUITE,tc1,
+			{failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
+     {?eh,test_stats,{3,5,{5,9}}},
 
      {?eh,tc_start,{ts_if_7_SUITE,tc1}},
      {?eh,tc_done,{ts_if_7_SUITE,tc1,ok}},
-     {?eh,test_stats,{4,5,{6,8}}},
+     {?eh,test_stats,{4,5,{5,9}}},
 
      {?eh,tc_start,{ts_if_8_SUITE,tc1}},
      {?eh,tc_done,{ts_if_8_SUITE,tc1,{failed,{error,failed_on_purpose}}}},
-     {?eh,test_stats,{4,6,{6,8}}},
+     {?eh,test_stats,{4,6,{5,9}}},
 
      {?eh,tc_user_skip,{skipped_by_spec_1_SUITE,all,"should be skipped"}},
-     {?eh,test_stats,{4,6,{7,8}}},
+     {?eh,test_stats,{4,6,{6,9}}},
 
      {?eh,tc_start,{skipped_by_spec_2_SUITE,init_per_suite}},
      {?eh,tc_done,{skipped_by_spec_2_SUITE,init_per_suite,ok}},
      {?eh,tc_user_skip,{skipped_by_spec_2_SUITE,tc1,"should be skipped"}},
-     {?eh,test_stats,{4,6,{8,8}}},
+     {?eh,test_stats,{4,6,{7,9}}},
      {?eh,tc_start,{skipped_by_spec_2_SUITE,end_per_suite}},
      {?eh,tc_done,{skipped_by_spec_2_SUITE,end_per_suite,ok}},