Merge branch 'siri/common_test/force_stop-skip_rest/OTP-10856' into maint

* siri/common_test/force_stop-skip_rest/OTP-10856:
  [common_test] Document '-force_stop skip_rest' option to ct_run
  [common_test] Add tests for repeated testruns
  [common_test] Add support for testing repeated testruns
  [common_test] Add -force_stop skip_rest option when repeating tests

4 files changed, 73 insertions, 52 deletions

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 04a95a53fa..e6732f7fc7 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -153,7 +153,7 @@ run(TestDirs) ->
 %%%               {auto_compile,Bool} | {create_priv_dir,CreatePrivDir}  |
 %%%               {multiply_timetraps,M} | {scale_timetraps,Bool} |
 %%%               {repeat,N} | {duration,DurTime} | {until,StopTime} |
-%%%               {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
+%%%               {force_stop,ForceStop} | {decrypt,DecryptKeyOrFile} |
 %%%               {refresh_logs,LogDir} | {logopts,LogOpts} | 
 %%%               {verbosity,VLevels} | {basic_html,Bool} | 
 %%%               {ct_hooks, CTHs} | {enable_builtin_hooks,Bool} |
@@ -184,6 +184,7 @@ run(TestDirs) ->
 %%%   N = integer()
 %%%   DurTime = string(HHMMSS)
 %%%   StopTime = string(YYMoMoDDHHMMSS) | string(HHMMSS)
+%%%   ForceStop = skip_rest | Bool
 %%%   DecryptKeyOrFile = {key,DecryptKey} | {file,DecryptFile}
 %%%   DecryptKey = string()
 %%%   DecryptFile = string()
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 5fe4eaf511..b92fe1555f 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -64,38 +64,46 @@ init_tc(Mod,Func,Config) ->
 	    ok
     end,
 
-    case ct_util:get_testdata(curr_tc) of
-	{Suite,{suite0_failed,{require,Reason}}} ->
-	    {skip,{require_failed_in_suite0,Reason}};
-	{Suite,{suite0_failed,_}=Failure} ->
-	    {skip,Failure};
+    case Func=/=end_per_suite
+	andalso Func=/=end_per_group
+	andalso ct_util:get_testdata(skip_rest) of
+	true ->
+	    {skip,"Repeated test stopped by force_stop option"};
 	_ ->
-	    ct_util:update_testdata(curr_tc,
-				    fun(undefined) ->
-					    [{Suite,Func}];
-				       (Running) ->
-					    [{Suite,Func}|Running]
-				    end, [create]),
-	    case ct_util:read_suite_data({seq,Suite,Func}) of
-		undefined ->
-		    init_tc1(Mod,Suite,Func,Config);
-		Seq when is_atom(Seq) ->
-		    case ct_util:read_suite_data({seq,Suite,Seq}) of
-			[Func|TCs] ->		% this is the 1st case in Seq
-			    %% make sure no cases in this seq are
-			    %% marked as failed from an earlier execution 
-			    %% in the same suite
-			    lists:foreach(
-			      fun(TC) ->
-				      ct_util:save_suite_data({seq,Suite,TC},
-							      Seq)
-			      end, TCs);
-			_ ->
-			    ok
-		    end,
-		    init_tc1(Mod,Suite,Func,Config);
-		{failed,Seq,BadFunc} ->
-		    {skip,{sequence_failed,Seq,BadFunc}}
+	    case ct_util:get_testdata(curr_tc) of
+		{Suite,{suite0_failed,{require,Reason}}} ->
+		    {skip,{require_failed_in_suite0,Reason}};
+		{Suite,{suite0_failed,_}=Failure} ->
+		    {skip,Failure};
+		_ ->
+		    ct_util:update_testdata(curr_tc,
+					    fun(undefined) ->
+						    [{Suite,Func}];
+					       (Running) ->
+						    [{Suite,Func}|Running]
+					    end, [create]),
+		    case ct_util:read_suite_data({seq,Suite,Func}) of
+			undefined ->
+			    init_tc1(Mod,Suite,Func,Config);
+			Seq when is_atom(Seq) ->
+			    case ct_util:read_suite_data({seq,Suite,Seq}) of
+				[Func|TCs] -> % this is the 1st case in Seq
+				    %% make sure no cases in this seq are
+				    %% marked as failed from an earlier execution
+				    %% in the same suite
+				    lists:foreach(
+				      fun(TC) ->
+					      ct_util:save_suite_data(
+						{seq,Suite,TC},
+						Seq)
+				      end, TCs);
+				_ ->
+				    ok
+			    end,
+			    init_tc1(Mod,Suite,Func,Config);
+			{failed,Seq,BadFunc} ->
+			    {skip,{sequence_failed,Seq,BadFunc}}
+		    end
 	    end
     end.	    
 
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl
index a47309c6ee..f4d9949776 100644
--- a/lib/common_test/src/ct_repeat.erl
+++ b/lib/common_test/src/ct_repeat.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. 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
@@ -23,7 +23,7 @@
 %%% start flags (or equivalent ct:run_test/1 options) are supported:
 %%% -until <StopTime>, StopTime = YYMoMoDDHHMMSS | HHMMSS
 %%% -duration <DurTime>, DurTime = HHMMSS
-%%% -force_stop
+%%% -force_stop [skip_rest]
 %%% -repeat <N>, N = integer()</p>
 
 -module(ct_repeat).
@@ -62,12 +62,15 @@ loop_test(If,Args) when is_list(Args) ->
 			io:format("\nCommon Test: "
 				  "Will repeat tests for ~s.\n\n",[ts(Secs)]),
 			TPid =
-			    case lists:keymember(force_stop,1,Args) of 
-				true ->
+			    case proplists:get_value(force_stop,Args) of
+				False when False==false; False==undefined ->
+				    undefined;
+				ForceStop ->
 				    CtrlPid = self(),
-				    spawn(fun() -> stop_after(CtrlPid,Secs) end);
-				false ->
-				    undefined
+				    spawn(
+				      fun() ->
+					      stop_after(CtrlPid,Secs,ForceStop)
+				      end)
 			    end,
 			Args1 = [{loop_info,[{stop_time,Secs,StopTime,1}]} | Args],
 			loop(If,stop_time,0,Secs,StopTime,Args1,TPid,[])
@@ -212,7 +215,7 @@ get_stop_time(until,[Y1,Y2,Mo1,Mo2,D1,D2,H1,H2,Mi1,Mi2,S1,S2]) ->
 	    list_to_integer([S1,S2])},
     calendar:datetime_to_gregorian_seconds({Date,Time});
 
-get_stop_time(until,Time) ->
+get_stop_time(until,Time=[_,_,_,_,_,_]) ->
     get_stop_time(until,"000000"++Time);
 
 get_stop_time(duration,[H1,H2,Mi1,Mi2,S1,S2]) ->
@@ -227,10 +230,17 @@ cancel(Pid) ->
 
 %% After Secs, abort will make the test_server finish the current
 %% job, then empty the job queue and stop.
-stop_after(_CtrlPid,Secs) ->
+stop_after(_CtrlPid,Secs,ForceStop) ->
     timer:sleep(Secs*1000),
+    case ForceStop of
+	SkipRest when SkipRest==skip_rest; SkipRest==["skip_rest"] ->
+	    ct_util:set_testdata({skip_rest,true});
+	_ ->
+	    ok
+    end,
     test_server_ctrl:abort().
 
+
 %% Callback from ct_run to print loop info to system log.
 log_loop_info(Args) ->
     case lists:keysearch(loop_info,1,Args) of
@@ -259,11 +269,11 @@ log_loop_info(Args) ->
 		io_lib:format("Test time remaining: ~w secs (~w%)\n",
 			      [Secs,trunc((Secs/Secs0)*100)]),
 	    LogStr4 =
-		case lists:keymember(force_stop,1,Args) of
-		    true ->
-			io_lib:format("force_stop is enabled",[]);
-		    _ ->
-			""
+		case proplists:get_value(force_stop,Args) of
+		    False when False==false; False==undefined ->
+			"";
+		    ForceStop ->
+			io_lib:format("force_stop is set to: ~w",[ForceStop])
 		end,			
 	    ct_logs:log("Test loop info",LogStr1++LogStr2++LogStr3++LogStr4,[])
     end.
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 49f00429ae..57cfab532e 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -771,9 +771,9 @@ script_usage() ->
 	      "\n\t[-scale_timetraps]"
 	      "\n\t[-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]"
 	      "\n\t[-basic_html]"
-	      "\n\t[-repeat N [-force_stop]] |"
-	      "\n\t[-duration HHMMSS [-force_stop]] |"
-	      "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop]]\n\n"),
+	      "\n\t[-repeat N] |"
+	      "\n\t[-duration HHMMSS [-force_stop [skip_rest]]] |"
+	      "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]\n\n"),
     io:format("Run tests using test specification:\n\n"
 	      "\tct_run -spec TestSpec1 TestSpec2 .. TestSpecN"
 	      "\n\t[-config ConfigFile1 ConfigFile2 .. ConfigFileN]"
@@ -795,9 +795,9 @@ script_usage() ->
 	      "\n\t[-scale_timetraps]"
 	      "\n\t[-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]"
 	      "\n\t[-basic_html]"
-	      "\n\t[-repeat N [-force_stop]] |"
-	      "\n\t[-duration HHMMSS [-force_stop]] |"
-	      "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop]]\n\n"),
+	      "\n\t[-repeat N] |"
+	      "\n\t[-duration HHMMSS [-force_stop [skip_rest]]] |"
+	      "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]\n\n"),
     io:format("Refresh the HTML index files:\n\n"
 	      "\tct_run -refresh_logs [LogDir]"
 	      "[-logdir LogDir] "
@@ -2933,6 +2933,8 @@ opts2args(EnvStartOpts) ->
 			  [];
 		     ({create_priv_dir,PD}) when is_atom(PD) ->
 			  [{create_priv_dir,[atom_to_list(PD)]}];
+		     ({force_stop,skip_rest}) ->
+			  [{force_stop,["skip_rest"]}];
 		     ({force_stop,true}) ->
 			  [{force_stop,[]}];
 		     ({force_stop,false}) ->