[ct] Fix hooks and fail when one of init/end_per_* does not exit

The following bugs are corrected:

- if init_per_suite is exported from a test suite, but not
  end_per_suite, then pre/post_end_per_suite will be called with
  Suite=ct_framework instead of the correct suite name.

- if end_per_group is exported from a suite, but not init_per_group,
  then end_per_group is never called.

According to the documentation, if implementing an init config
function, you must also implement the end config function, so the two
scenarios above are really not allowed. To make this more visible,
common_test will now mark the non-exported config function as failed
with reason 'undef' if the other function is exported.

For example, if init_per_suite is exported, but not end_per_suite,
then end_per_suite will be marked as failed with reason undef. (If
none of them exist, then they will both be marked as passed since the
default functions in ct_framework are called instead.)

All hook functions are always called with the correct suite name,
i.e. never with Suite=ct_framework.

Conflicts:
	lib/common_test/test/ct_hooks_SUITE.erl

8 files changed, 384 insertions, 36 deletions

diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 48ffe653e4..d407a0a53f 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -224,7 +224,9 @@
 	</type>
 	<desc>	
 
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined, then <seealso
+	  marker="#Module:end_per_suite-1"><c>end_per_suite/1</c></seealso>
+	  must also be defined.</p>
 
 	  <p>This configuration function is called as the first function in the
 	  suite. It typically contains initializations that are common for
@@ -256,7 +258,9 @@
       </type>
 
       <desc>	
-	<p>OPTIONAL</p>
+	<p>OPTIONAL; if this function is defined, then <seealso
+	  marker="#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>
+	  must also be defined.</p>
 	
 	<p>This function is called as the last test case in the
 	  suite. It is meant to be used for cleaning up after
@@ -360,7 +364,9 @@
 	</type>
 	<desc>	
 
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined, then <seealso
+	    marker="#Module:end_per_group-2"><c>end_per_group/2</c></seealso>
+	    must also be defined.</p>
 
 	  <p>This configuration function is called before execution of a
 	    test case group. It typically contains initializations that are 
@@ -396,7 +402,9 @@
 	</type>
 
 	<desc>	
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined, then <seealso
+	    marker="#Module:init_per_group-2"><c>init_per_group/2</c></seealso>
+	    must also be defined.</p>
 
 	  <p>This function is called after the execution of a test case group
 	    is finished. It is meant to be used for cleaning up after
@@ -427,7 +435,10 @@
 	</type>
 	<desc>
 
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined,
+	    then <seealso marker="#Module:end_per_testcase-2">
+	      <c>end_per_testcase/2</c></seealso> must also be
+	    defined.</p>
 
 	  <p>This function is called before each test case. Argument
 	  <c>TestCase</c> is the test case name, and
@@ -454,7 +465,10 @@
 	</type>
 	<desc>	
 
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined,
+	    then <seealso marker="#Module:init_per_testcase-2">
+	      <c>init_per_testcase/2</c></seealso> must also be
+	    defined.</p>
 
 	  <p>This function is called after each test case, and can be used
 	    to clean up after
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index f70bdb16c5..6a0d87bcaf 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -566,7 +566,7 @@
     for the test cases in the group. After execution of the group is finished, function
     <seealso marker="common_test#Module:end_per_group-2"><c>end_per_group(GroupName, Config)</c></seealso> 
     is called. This function is meant to be used for cleaning up after 
-    <c>init_per_group/2</c>.</p>
+    <c>init_per_group/2</c>. If the init function is defined, so must the end function be.</p>
 
     <p>Whenever a group is executed, if <c>init_per_group</c> and
       <c>end_per_group</c> do not exist in the suite, <c>Common Test</c> calls
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
index 1375e7dcc7..1c9faf6a70 100644
--- a/lib/common_test/src/ct_groups.erl
+++ b/lib/common_test/src/ct_groups.erl
@@ -442,17 +442,21 @@ make_conf(Mod, Name, Props, TestSpec) ->
 	    ok
     end,
     {InitConf,EndConf,ExtraProps} =
-	case erlang:function_exported(Mod,init_per_group,2) of
-	    true ->
-		{{Mod,init_per_group},{Mod,end_per_group},[]};
-	    false ->
+	case {erlang:function_exported(Mod,init_per_group,2),
+              erlang:function_exported(Mod,end_per_group,2)} of
+	    {false,false} ->
 		ct_logs:log("TEST INFO", "init_per_group/2 and "
 			    "end_per_group/2 missing for group "
 			    "~w in ~w, using default.",
 			    [Name,Mod]),
 		{{ct_framework,init_per_group},
 		 {ct_framework,end_per_group},
-		 [{suite,Mod}]}
+		 [{suite,Mod}]};
+	    _ ->
+                %% If any of these exist, the other should too
+                %% (required and documented). If it isn't, it will fail
+                %% with reason 'undef'.
+		{{Mod,init_per_group},{Mod,end_per_group},[]}
 	end,
     {conf,[{name,Name}|Props++ExtraProps],InitConf,TestSpec,EndConf}.
 
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index b52e4bef9b..d3a0f74f7a 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -2051,17 +2051,21 @@ add_init_and_end_per_suite([], _LastMod, skipped_suite, _FwMod) ->
 add_init_and_end_per_suite([], LastMod, LastRef, FwMod) ->
     %% we'll add end_per_suite here even if it's not exported
     %% (and simply let the call fail if it's missing)
-    case erlang:function_exported(LastMod, end_per_suite, 1) of
-	true ->
-	    [{conf,LastRef,[],{LastMod,end_per_suite}}];
-	false ->
+    case {erlang:function_exported(LastMod, end_per_suite, 1),
+          erlang:function_exported(LastMod, init_per_suite, 1)} of
+	{false,false} ->
 	    %% let's call a "fake" end_per_suite if it exists			
 	    case erlang:function_exported(FwMod, end_per_suite, 1) of
 		true ->					
 		    [{conf,LastRef,[{suite,LastMod}],{FwMod,end_per_suite}}];
 		false ->		
 		    [{conf,LastRef,[],{LastMod,end_per_suite}}]
-	    end
+	    end;
+	_ ->
+            %% If any of these exist, the other should too
+            %% (required and documented). If it isn't, it will fail
+            %% with reason 'undef'.
+	    [{conf,LastRef,[],{LastMod,end_per_suite}}]
     end.    
 
 do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod) ->
@@ -2070,11 +2074,9 @@ do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod) ->
 	_ -> ok
     end,
     {Init,NextMod,NextRef} =
-	case erlang:function_exported(Mod, init_per_suite, 1) of
-	    true ->
-		Ref = make_ref(),
-		{[{conf,Ref,[],{Mod,init_per_suite}}],Mod,Ref};
-	    false ->
+	case {erlang:function_exported(Mod, init_per_suite, 1),
+              erlang:function_exported(Mod, end_per_suite, 1)} of
+	    {false,false} ->
 		%% let's call a "fake" init_per_suite if it exists
 		case erlang:function_exported(FwMod, init_per_suite, 1) of
 		    true ->
@@ -2083,8 +2085,13 @@ do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod) ->
 			   {FwMod,init_per_suite}}],Mod,Ref};
 		    false ->
 			{[],Mod,undefined}
-		end
-
+		end;
+	    _ ->
+                %% If any of these exist, the other should too
+                %% (required and documented). If it isn't, it will fail
+                %% with reason 'undef'.
+		Ref = make_ref(),
+		{[{conf,Ref,[],{Mod,init_per_suite}}],Mod,Ref}
 	end,
     Cases =
 	if LastRef==undefined ->
@@ -2094,10 +2101,9 @@ do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod) ->
 	   true ->
 		%% we'll add end_per_suite here even if it's not exported
 		%% (and simply let the call fail if it's missing)
-		case erlang:function_exported(LastMod, end_per_suite, 1) of
-		    true ->
-			[{conf,LastRef,[],{LastMod,end_per_suite}}|Init];
-		    false ->
+		case {erlang:function_exported(LastMod, end_per_suite, 1),
+                      erlang:function_exported(LastMod, init_per_suite, 1)} of
+		    {false,false} ->
 			%% let's call a "fake" end_per_suite if it exists
 			case erlang:function_exported(FwMod, end_per_suite, 1) of
 			    true ->				
@@ -2105,8 +2111,13 @@ do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod) ->
 				  {FwMod,end_per_suite}}|Init];
 			    false ->
 				[{conf,LastRef,[],{LastMod,end_per_suite}}|Init]
-			end
-		end
+			end;
+		    _ ->
+                        %% If any of these exist, the other should too
+                        %% (required and documented). If it isn't, it will fail
+                        %% with reason 'undef'.
+			[{conf,LastRef,[],{LastMod,end_per_suite}}|Init]
+                end
 	end,
     {Cases,NextMod,NextRef}.
 
@@ -2115,11 +2126,9 @@ do_add_end_per_suite_and_skip(LastMod, LastRef, Mod, FwMod) ->
 	No when No==undefined ; No==skipped_suite ->
 	    {[],Mod,skipped_suite};
 	_Ref ->
-	    case erlang:function_exported(LastMod, end_per_suite, 1) of
-		true ->
-		    {[{conf,LastRef,[],{LastMod,end_per_suite}}],
-		     Mod,skipped_suite};
-		false ->
+	    case {erlang:function_exported(LastMod, end_per_suite, 1),
+                  erlang:function_exported(LastMod, init_per_suite, 1)} of
+		{false,false} ->
 		    case erlang:function_exported(FwMod, end_per_suite, 1) of
 			true ->				
 			    %% let's call "fake" end_per_suite if it exists
@@ -2128,7 +2137,13 @@ do_add_end_per_suite_and_skip(LastMod, LastRef, Mod, FwMod) ->
 			false ->
 			    {[{conf,LastRef,[],{LastMod,end_per_suite}}],
 			     Mod,skipped_suite}
-		    end
+		    end;
+		_ ->
+                    %% If any of these exist, the other should too
+                    %% (required and documented). If it isn't, it will fail
+                    %% with reason 'undef'.
+		    {[{conf,LastRef,[],{LastMod,end_per_suite}}],
+		     Mod,skipped_suite}
 	    end    	    
     end.
 
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 32f8ad1a22..835e3d4805 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -85,6 +85,7 @@ all(suite) ->
        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, no_config,
+       no_init_suite_config, no_init_config, no_end_config,
        fallback, data_dir, cth_log
       ]
     ).
@@ -223,6 +224,16 @@ no_config(Config) when is_list(Config) ->
     do_test(no_config, "ct_no_config_SUITE.erl",
 	    [verify_config_cth],Config).
 
+no_init_suite_config(Config) when is_list(Config) ->
+    do_test(no_init_suite_config, "ct_no_init_suite_config_SUITE.erl",
+            [empty_cth],Config).
+
+no_init_config(Config) when is_list(Config) ->
+    do_test(no_init_config, "ct_no_init_config_SUITE.erl",[empty_cth],Config).
+
+no_end_config(Config) when is_list(Config) ->
+    do_test(no_end_config, "ct_no_end_config_SUITE.erl",[empty_cth],Config).
+
 data_dir(Config) when is_list(Config) ->
     do_test(data_dir, "ct_data_dir_SUITE.erl",
 	    [verify_data_dir_cth],Config).
@@ -1260,6 +1271,166 @@ test_events(no_config) ->
      {?eh,stop_logging,[]}
     ];
 
+test_events(no_init_suite_config) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{ct_no_init_suite_config_SUITE,init_per_suite}},
+     {?eh,cth,{empty_cth,pre_init_per_suite,
+	       [ct_no_init_suite_config_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_init_per_suite,
+	       [ct_no_init_suite_config_SUITE,'$proplist','_',[]]}},
+     {?eh,tc_done,{ct_no_init_suite_config_SUITE,init_per_suite,
+                   {failed,{error,{undef,'_'}}}}},
+     {?eh,cth,{empty_cth,on_tc_fail,[ct_no_init_suite_config_SUITE,
+                                     init_per_suite,
+                                     {failed,{undef,'_'}},[]]}},
+      {?eh,tc_auto_skip,{ct_no_init_suite_config_SUITE,test_case,
+                         {failed,{ct_no_init_suite_config_SUITE,init_per_suite,
+                                  {'EXIT',{undef,'_'}}}}}},
+     {?eh,cth,{empty_cth,on_tc_skip,
+               [ct_no_init_suite_config_SUITE,
+                test_case,
+                {tc_auto_skip,
+                 {failed,{ct_no_init_suite_config_SUITE,init_per_suite,
+                          {'EXIT',{undef,'_'}}}}},
+                []]}},
+     {?eh,test_stats,{0,0,{0,1}}},
+     {?eh,tc_auto_skip,{ct_no_init_suite_config_SUITE,end_per_suite,
+                        {failed,{ct_no_init_suite_config_SUITE,init_per_suite,
+                                 {'EXIT',{undef,'_'}}}}}},
+     {?eh,cth,{empty_cth,on_tc_skip,
+               [ct_no_init_suite_config_SUITE,
+                end_per_suite,
+                {tc_auto_skip,
+                 {failed,{ct_no_init_suite_config_SUITE,init_per_suite,
+                          {'EXIT',{undef,'_'}}}}},
+                []]}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(no_init_config) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,start_info,{1,1,2}},
+     {?eh,tc_start,{ct_no_init_config_SUITE,init_per_suite}},
+     {?eh,cth,{empty_cth,pre_init_per_suite,
+	       [ct_no_init_config_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_init_per_suite,
+	       [ct_no_init_config_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,tc_done,{ct_no_init_config_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{ct_no_init_config_SUITE,test_case_1}},
+     {?eh,cth,{empty_cth,pre_init_per_testcase,
+	       [ct_no_init_config_SUITE,test_case_1,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_testcase,
+	       [ct_no_init_config_SUITE,test_case_1,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_no_init_config_SUITE,test_case_1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     [{?eh,tc_start,{ct_no_init_config_SUITE,{init_per_group,test_group,[]}}},
+      {?eh,cth,{empty_cth,pre_init_per_group,
+		[ct_no_init_config_SUITE,test_group,'$proplist',[]]}},
+      {?eh,cth,{empty_cth,post_init_per_group,
+		[ct_no_init_config_SUITE,test_group,'$proplist','_',[]]}},
+      {?eh,tc_done,{ct_no_init_config_SUITE,{init_per_group,test_group,[]},
+                    {failed,{error,{undef,'_'}}}}},
+      {?eh,cth,{empty_cth,on_tc_fail,[ct_no_init_config_SUITE,
+                                      {init_per_group,test_group},
+                                      {failed,{undef,'_'}},[]]}},
+      {?eh,tc_auto_skip,{ct_no_init_config_SUITE,{test_case_2,test_group},
+                         {failed,{ct_no_init_config_SUITE,init_per_group,
+                                  {'EXIT',{undef,'_'}}}}}},
+      {?eh,cth,{empty_cth,on_tc_skip,[ct_no_init_config_SUITE,
+                                      {test_case_2,test_group},
+                                      {tc_auto_skip,
+                                       {failed,
+                                        {ct_no_init_config_SUITE,init_per_group,
+                                         {'EXIT',{undef,'_'}}}}},
+                                       []]}},
+      {?eh,test_stats,{1,0,{0,1}}},
+      {?eh,tc_auto_skip,{ct_no_init_config_SUITE,{end_per_group,test_group},
+                         {failed,{ct_no_init_config_SUITE,init_per_group,
+                                  {'EXIT',{undef,'_'}}}}}},
+      {?eh,cth,{empty_cth,on_tc_skip,[ct_no_init_config_SUITE,
+                                      {end_per_group,test_group},
+                                      {tc_auto_skip,
+                                       {failed,
+                                        {ct_no_init_config_SUITE,init_per_group,
+                                         {'EXIT',{undef,'_'}}}}},
+                                       []]}}],
+     {?eh,tc_start,{ct_no_init_config_SUITE,end_per_suite}},
+     {?eh,cth,{empty_cth,pre_end_per_suite,
+	       [ct_no_init_config_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_suite,
+	       [ct_no_init_config_SUITE,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_no_init_config_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(no_end_config) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,start_info,{1,1,2}},
+     {?eh,tc_start,{ct_no_end_config_SUITE,init_per_suite}},
+     {?eh,cth,{empty_cth,pre_init_per_suite,
+	       [ct_no_end_config_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_init_per_suite,
+	       [ct_no_end_config_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,tc_done,{ct_no_end_config_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{ct_no_end_config_SUITE,test_case_1}},
+     {?eh,cth,{empty_cth,pre_init_per_testcase,
+	       [ct_no_end_config_SUITE,test_case_1,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_testcase,
+	       [ct_no_end_config_SUITE,test_case_1,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_no_end_config_SUITE,test_case_1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     [{?eh,tc_start,{ct_no_end_config_SUITE,
+                     {init_per_group,test_group,'$proplist'}}},
+      {?eh,cth,{empty_cth,pre_init_per_group,
+		[ct_no_end_config_SUITE,test_group,'$proplist',[]]}},
+      {?eh,cth,{empty_cth,post_init_per_group,
+		[ct_no_end_config_SUITE,test_group,'$proplist','$proplist',[]]}},
+      {?eh,tc_done,{ct_no_end_config_SUITE,
+		    {init_per_group,test_group,'$proplist'},ok}},
+      {?eh,tc_start,{ct_no_end_config_SUITE,test_case_2}},
+      {?eh,cth,{empty_cth,pre_init_per_testcase,
+		[ct_no_end_config_SUITE,test_case_2,'$proplist',[]]}},
+      {?eh,cth,{empty_cth,post_end_per_testcase,
+		[ct_no_end_config_SUITE,test_case_2,'$proplist',ok,[]]}},
+      {?eh,tc_done,{ct_no_end_config_SUITE,test_case_2,ok}},
+      {?eh,test_stats,{2,0,{0,0}}},
+      {?eh,tc_start,{ct_no_end_config_SUITE,
+                     {end_per_group,test_group,'$proplist'}}},
+      {?eh,cth,{empty_cth,pre_end_per_group,
+		[ct_no_end_config_SUITE,test_group,'$proplist',[]]}},
+      {?eh,cth,{empty_cth,post_end_per_group,
+		[ct_no_end_config_SUITE,test_group,'$proplist','_',[]]}},
+      {?eh,tc_done,{ct_no_end_config_SUITE,{end_per_group,test_group,[]},
+                    {failed,{error,{undef,'_'}}}}},
+      {?eh,cth,{empty_cth,on_tc_fail,[ct_no_end_config_SUITE,
+                                      {end_per_group,test_group},
+                                      {failed,{undef,'_'}},[]]}}],
+     {?eh,tc_start,{ct_no_end_config_SUITE,end_per_suite}},
+     {?eh,cth,{empty_cth,pre_end_per_suite,
+	       [ct_no_end_config_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_suite,
+	       [ct_no_end_config_SUITE,'$proplist','_',[]]}},
+     {?eh,tc_done,{ct_no_end_config_SUITE,end_per_suite,
+                   {failed,{error,{undef,'_'}}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(data_dir) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_end_config_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_end_config_SUITE.erl
new file mode 100644
index 0000000000..7cdaf2024b
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_end_config_SUITE.erl
@@ -0,0 +1,51 @@
+%%
+%% %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_no_end_config_SUITE).
+
+-compile(export_all).
+
+-include("ct.hrl").
+
+%%% This suite is used to verify that all pre/post_end_per_* callbacks
+%%% are called with correct SuiteName even if no end_per_* config
+%%% function exist in the suite, and that the non-exported config
+%%% functions fail with 'undef'.
+
+init_per_suite(Config) ->
+    Config.
+
+init_per_group(_Group,Config) ->
+    Config.
+
+init_per_testcase(_TC,Config) ->
+    Config.
+
+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/ct_no_init_config_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_init_config_SUITE.erl
new file mode 100644
index 0000000000..43c062d66f
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_init_config_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_no_init_config_SUITE).
+
+-compile(export_all).
+
+-include("ct.hrl").
+
+%%% This suite is used to verify that all
+%%% pre/post_init_per_group/testcase callbacks are called with correct
+%%% SuiteName even if no init_per_group/testcase function exist in the
+%%% suite, and that the non-exported config functions fail with 'undef'.
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+end_per_group(_Group,Config) ->
+    Config.
+
+end_per_testcase(_TC,Config) ->
+    Config.
+
+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/ct_no_init_suite_config_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_init_suite_config_SUITE.erl
new file mode 100644
index 0000000000..85dfe8ca4b
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_no_init_suite_config_SUITE.erl
@@ -0,0 +1,39 @@
+%%
+%% %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_no_init_suite_config_SUITE).
+
+-compile(export_all).
+
+-include("ct.hrl").
+
+%%% This suite is used to verify that pre/post_init_per_suite
+%%% callbacks are called with correct SuiteName even if no
+%%% init_per_suite function exist in the suite, and that the
+%%% non-exported config function fails with 'undef'.
+
+end_per_suite(Config) ->
+    Config.
+
+all() ->
+    [test_case].
+
+test_case(Config) ->
+    ok.