Merge branch 'peppe/common_test/rm_unwanted_tests' into maint

* peppe/common_test/rm_unwanted_tests:
  Fix remaining issues
  Enable execution of multiple test cases or groups from a test spec term

OTP-13241

3 files changed, 137 insertions, 100 deletions

diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
index 7636f15f59..92640cf323 100644
--- a/lib/common_test/src/ct_groups.erl
+++ b/lib/common_test/src/ct_groups.erl
@@ -81,7 +81,7 @@ find(Mod, all, all, [{Name,Props,Tests} | Gs], Known, Defs, _)
 find(Mod, all, TCs, [{Name,Props,Tests} | Gs], Known, Defs, _) 
   when is_atom(Name), is_list(Props), is_list(Tests) ->
     cyclic_test(Mod, Name, Known),
-    Tests1 = rm_unwanted_tcs(Tests, TCs, []),
+    Tests1 = modify_tc_list(Tests, TCs, []),
     trim(make_conf(Mod, Name, Props,
 		   find(Mod, all, TCs, Tests1, [Name | Known],
 			Defs, true))) ++
@@ -91,7 +91,7 @@ find(Mod, all, TCs, [{Name,Props,Tests} | Gs], Known, Defs, _)
 find(Mod, [Name|GrNames]=SPath, TCs, [{Name,Props,Tests} | Gs], Known,
      Defs, FindAll) when is_atom(Name), is_list(Props), is_list(Tests) ->
     cyclic_test(Mod, Name, Known),
-    Tests1 = rm_unwanted_tcs(Tests, TCs, GrNames),
+    Tests1 = modify_tc_list(Tests, TCs, GrNames),
     trim(make_conf(Mod, Name, Props,
 		   find(Mod, GrNames, TCs, Tests1, [Name|Known],
 			Defs, FindAll))) ++
@@ -133,7 +133,7 @@ find(_Mod, [_|_], _TCs, [], _Known, _Defs, _) ->
 find(Mod, GrNames, TCs, [{Name,Props,Tests} | Gs], Known,
      Defs, FindAll) when is_atom(Name), is_list(Props), is_list(Tests) ->
     cyclic_test(Mod, Name, Known),
-    Tests1 = rm_unwanted_tcs(Tests, TCs, GrNames),
+    Tests1 = modify_tc_list(Tests, TCs, GrNames),
     trim(make_conf(Mod, Name, Props,
 		   find(Mod, GrNames, TCs, Tests1, [Name|Known],
 			Defs, FindAll))) ++
@@ -284,70 +284,57 @@ trim_test(Test) ->
 %% GrNames is [] if the terminating group has been found. From
 %% that point, all specified test should be included (as well as
 %% sub groups for deeper search).
-rm_unwanted_tcs(Tests, all, []) ->
-    Tests;
-
-rm_unwanted_tcs(Tests, TCs, []) ->
-    sort_tests(lists:flatmap(fun(Test) when is_tuple(Test),
-					    (size(Test) > 2) ->
-				     [Test];
-				(Test={group,_}) ->
-				     [Test];
-				(Test={_M,TC}) ->
-				     case lists:member(TC, TCs) of
-					 true  -> [Test];
-					 false -> []
-				     end;
-				(Test) when is_atom(Test) ->
-				     case lists:keysearch(Test, 2, TCs) of
-					 {value,_} ->
-					     [Test];
-					 _ ->
-					     case lists:member(Test, TCs) of
-						 true  -> [Test];
-						 false -> []
-					     end
-				     end;
-				(Test) -> [Test]
-			     end, Tests), TCs);
-					  
-rm_unwanted_tcs(Tests, _TCs, _) ->
-    [Test || Test <- Tests, not is_atom(Test)].
-
-%% make sure the order of tests is according to the order in TCs
-sort_tests(Tests, TCs) when is_list(TCs)->
-    lists:sort(fun(T1, T2) ->
-		       case {is_tc(T1),is_tc(T2)} of
-			   {true,true} ->
-			       (position(T1, TCs) =<
-				position(T2, TCs));
-			   {false,true} ->
-			       (position(T2, TCs) == (length(TCs)+1));
-			   _ -> true
-				   
-		       end
-	       end, Tests);
-sort_tests(Tests, _) ->
-    Tests.
-
-is_tc(T) when is_atom(T)      -> true;
-is_tc({group,_})              -> false;
-is_tc({_M,T}) when is_atom(T) -> true;
-is_tc(_)                      -> false.
-
-position(T, TCs) ->
-    position(T, TCs, 1).
-
-position(T, [T|_TCs], Pos) ->
-    Pos;
-position(T, [{_,T}|_TCs], Pos) ->
-    Pos;
-position({M,T}, [T|_TCs], Pos) when M /= group ->
-    Pos;
-position(T, [_|TCs], Pos) ->
-    position(T, TCs, Pos+1);
-position(_, [], Pos) ->
-    Pos.
+modify_tc_list(GrSpecTs, all, []) ->
+    GrSpecTs;
+
+modify_tc_list(GrSpecTs, TSCs, []) ->
+    modify_tc_list1(GrSpecTs, TSCs);
+    
+modify_tc_list(GrSpecTs, _TSCs, _) ->
+    [Test || Test <- GrSpecTs, not is_atom(Test)].
+
+modify_tc_list1(GrSpecTs, TSCs) ->
+    %% remove all cases in group tc list that should not be executed
+    GrSpecTs1 =
+	lists:flatmap(fun(Test) when is_tuple(Test),
+				     (size(Test) > 2) ->
+			      [Test];
+			 (Test={group,_}) ->
+			      [Test];
+			 (Test={_M,TC}) ->
+			      case lists:member(TC, TSCs) of
+				  true  -> [Test];
+				  false -> []
+			      end;
+			 (Test) when is_atom(Test) ->
+			      case lists:keysearch(Test, 2, TSCs) of
+				  {value,_} ->
+				      [Test];
+				  _ ->
+				      case lists:member(Test, TSCs) of
+					  true  -> [Test];
+					  false -> []
+				      end
+			      end;
+			 (Test) -> [Test]
+		      end, GrSpecTs),
+    {TSCs2,GrSpecTs3} =
+	lists:foldr(
+	  fun(TC, {TSCs1,GrSpecTs2}) ->
+		  case lists:member(TC,GrSpecTs1) of
+		      true ->
+			  {[TC|TSCs1],lists:delete(TC,GrSpecTs2)};
+		      false ->
+			  case lists:keymember(TC, 2, GrSpecTs) of
+			      {value,Test} ->
+				  {[Test|TSCs1],
+				   lists:keydelete(TC, 2, GrSpecTs2)};
+			      false ->
+				  {TSCs1,GrSpecTs2}
+			  end
+		  end
+	  end, {[],GrSpecTs1}, TSCs),
+    TSCs2 ++ GrSpecTs3.
 
 %%%-----------------------------------------------------------------
 
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index b4364b87ff..ceb94ceee5 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -2055,6 +2055,13 @@ final_tests1([{TestDir,Suite,GrsOrCs}|Tests], Final, Skip, Bad) when
 		     ({skipped,Group,TCs}) ->
 			  [ct_groups:make_conf(TestDir, Suite,
 					       Group, [skipped], TCs)];
+		     ({skipped,TC}) ->
+			  case lists:member(TC, GrsOrCs) of
+			      true ->
+				  [];
+			      false ->
+				  [TC]
+			  end;
 		     ({GrSpec = {GroupName,_},TCs}) ->
 			  Props = [{override,GrSpec}],
 			  [ct_groups:make_conf(TestDir, Suite,
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index 5d5448f352..5cd52bd042 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -70,13 +70,17 @@ prepare_tests(TestSpec) when is_record(TestSpec,testspec) ->
     Tests = TestSpec#testspec.tests,
     %% Sort Tests into "flat" Run and Skip lists (not sorted per node).
     {Run,Skip} = get_run_and_skip(Tests,[],[]),
+
     %% Create initial list of {Node,{Run,Skip}} tuples
     NodeList = lists:map(fun(N) -> {N,{[],[]}} end, list_nodes(TestSpec)),
+
     %% Get all Run tests sorted per node basis.
     NodeList1 = run_per_node(Run,NodeList, 
-			     TestSpec#testspec.merge_tests),    
+			     TestSpec#testspec.merge_tests),
+    
     %% Get all Skip entries sorted per node basis.
     NodeList2 = skip_per_node(Skip,NodeList1),
+
     %% Change representation.
     Result=
 	lists:map(fun({Node,{Run1,Skip1}}) ->
@@ -103,7 +107,7 @@ run_per_node([{{Node,Dir},Test}|Ts],Result,MergeTests) ->
 	       true ->
 		   merge_tests(Dir,Test,Run)
 	   end,
-    run_per_node(Ts,insert_in_order({Node,{Run1,Skip}},Result), 
+    run_per_node(Ts,insert_in_order({Node,{Run1,Skip}},Result,replace), 
 		 MergeTests);
 run_per_node([],Result,_) ->
     Result.
@@ -140,7 +144,7 @@ merge_suites(Dir,Test,[]) ->
 skip_per_node([{{Node,Dir},Test}|Ts],Result) ->
     {value,{Node,{Run,Skip}}} = lists:keysearch(Node,1,Result),
     Skip1 = [{Dir,Test}|Skip],
-    skip_per_node(Ts,insert_in_order({Node,{Run,Skip1}},Result));
+    skip_per_node(Ts,insert_in_order({Node,{Run,Skip1}},Result,replace));
 skip_per_node([],Result) -> 
     Result.
 
@@ -156,7 +160,7 @@ skip_per_node([],Result) ->
 %%
 %%   Skip entry: {Suites,Comment} or {Suite,Cases,Comment}
 %%
-get_run_and_skip([{{Node,Dir},Suites}|Tests],Run,Skip) ->    
+get_run_and_skip([{{Node,Dir},Suites}|Tests],Run,Skip) ->
     TestDir = ct_util:get_testdir(Dir,catch element(1,hd(Suites))),
     case lists:keysearch(all,1,Suites) of
 	{value,_} ->				% all Suites in Dir
@@ -183,18 +187,33 @@ prepare_suites(Node,Dir,[{Suite,Cases}|Suites],Run,Skip) ->
 			   [[{{Node,Dir},{Suite,all}}]|Run],
 			   [Skipped|Skip]);
 	false ->
-	    {RL,SL} = prepare_cases(Node,Dir,Suite,Cases),
-	    prepare_suites(Node,Dir,Suites,[RL|Run],[SL|Skip])
+	    {Run1,Skip1} = prepare_cases(Node,Dir,Suite,Cases,Run,Skip),
+	    prepare_suites(Node,Dir,Suites,Run1,Skip1)
     end;
 prepare_suites(_Node,_Dir,[],Run,Skip) ->
     {lists:flatten(lists:reverse(Run)),
      lists:flatten(lists:reverse(Skip))}.
 
-prepare_cases(Node,Dir,Suite,Cases) ->
+prepare_cases(Node,Dir,Suite,Cases,Run,Skip) ->
     case get_skipped_cases(Node,Dir,Suite,Cases) of
-	SkipAll=[{{Node,Dir},{Suite,_Cmt}}] ->	      % all cases to be skipped
-	    %% note: this adds an 'all' test even if only skip is specified
-	    {[{{Node,Dir},{Suite,all}}],SkipAll};
+	[SkipAll={{Node,Dir},{Suite,_Cmt}}] ->	      % all cases to be skipped
+	    case lists:any(fun({{N,D},{S,all}}) when N == Node,
+						     D == Dir,
+						     S == Suite ->
+				   true;
+			      ({{N,D},{S,Cs}}) when N == Node,
+						    D == Dir,
+						    S == Suite ->
+				   lists:member(all,Cs);
+			      (_) -> false
+			   end, lists:flatten(Run)) of
+		true ->
+		    {Run,[SkipAll|Skip]};
+		false ->
+		    %% note: this adds an 'all' test even if
+		    %% only skip is specified		    
+		    {[{{Node,Dir},{Suite,all}}|Run],[SkipAll|Skip]}
+	    end;
 	Skipped ->
 	    %% note: this adds a test even if only skip is specified
 	    PrepC = lists:foldr(fun({{G,Cs},{skip,_Cmt}}, Acc) when
@@ -210,11 +229,11 @@ prepare_cases(Node,Dir,Suite,Cases) ->
 					    true ->
 						Acc;
 					    false ->
-						[C|Acc]
+						[{skipped,C}|Acc]
 					end;
 				   (C,Acc) -> [C|Acc]
 				end, [], Cases),
-    {{{Node,Dir},{Suite,PrepC}},Skipped}
+	    {[{{Node,Dir},{Suite,PrepC}}|Run],[Skipped|Skip]}
     end.
 
 get_skipped_suites(Node,Dir,Suites) ->
@@ -431,6 +450,7 @@ collect_tests({Replace,Terms},TestSpec=#testspec{alias=As,nodes=Ns},Relaxed) ->
 						    merge_tests = MergeTestsDef}),
     TestSpec2 = get_all_nodes(Terms2,TestSpec1),
     {Terms3, TestSpec3} = filter_init_terms(Terms2, [], TestSpec2),
+
     add_tests(Terms3,TestSpec3).
 
 %% replace names (atoms) in the testspec matching those in 'define' terms by
@@ -1257,7 +1277,7 @@ insert_groups1(Suite,Groups,Suites0) ->
 	    Suites0;
 	{value,{Suite,GrAndCases0}} ->
 	    GrAndCases = insert_groups2(Groups,GrAndCases0),
-	    insert_in_order({Suite,GrAndCases},Suites0);
+	    insert_in_order({Suite,GrAndCases},Suites0,replace);
 	false ->
 	    insert_in_order({Suite,Groups},Suites0)
     end.
@@ -1282,7 +1302,7 @@ insert_cases(Node,Dir,Suite,Cases,Tests,false) when is_list(Cases) ->
 insert_cases(Node,Dir,Suite,Cases,Tests,true) when is_list(Cases) ->
     {Tests1,Done} =
 	lists:foldr(fun(All={{N,D},[{all,_}]},{Merged,_}) when N == Node,
-								 D == Dir ->
+							       D == Dir ->
 			    {[All|Merged],true};
 		       ({{N,D},Suites0},{Merged,_}) when N == Node,
 							   D == Dir ->
@@ -1312,7 +1332,7 @@ insert_cases1(Suite,Cases,Suites0) ->
 	    Suites0;
 	{value,{Suite,Cases0}} ->
 	    Cases1 = insert_in_order(Cases,Cases0),
-	    insert_in_order({Suite,Cases1},Suites0);
+	    insert_in_order({Suite,Cases1},Suites0,replace);
 	false ->
 	    insert_in_order({Suite,Cases},Suites0)
     end.
@@ -1369,9 +1389,9 @@ skip_groups1(Suite,Groups,Cmt,Suites0) ->
     case lists:keysearch(Suite,1,Suites0) of
 	{value,{Suite,GrAndCases0}} ->
 	    GrAndCases1 = GrAndCases0 ++ SkipGroups,
-	    insert_in_order({Suite,GrAndCases1},Suites0);
+	    insert_in_order({Suite,GrAndCases1},Suites0,replace);
 	false ->
-	    insert_in_order({Suite,SkipGroups},Suites0)
+	    insert_in_order({Suite,SkipGroups},Suites0,replace)
     end.
 
 skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,false) when is_list(Cases) ->
@@ -1380,7 +1400,7 @@ skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,false) when is_list(Cases) ->
 skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,true) when is_list(Cases) ->
     {Tests1,Done} =
 	lists:foldr(fun({{N,D},Suites0},{Merged,_}) when N == Node,
-							   D == Dir ->
+							 D == Dir ->
 			    Suites1 = skip_cases1(Suite,Cases,Cmt,Suites0),
 			    {[{{N,D},Suites1}|Merged],true};
 		       (T,{Merged,Match}) ->
@@ -1401,32 +1421,55 @@ skip_cases1(Suite,Cases,Cmt,Suites0) ->
     case lists:keysearch(Suite,1,Suites0) of
 	{value,{Suite,Cases0}} ->
 	    Cases1 = Cases0 ++ SkipCases,
-	    insert_in_order({Suite,Cases1},Suites0);
+	    insert_in_order({Suite,Cases1},Suites0,replace);
 	false ->
-	    insert_in_order({Suite,SkipCases},Suites0)
+	    case Suites0 of
+		[{all,_}=All|Skips]->
+		    [All|Skips++[{Suite,SkipCases}]];
+		_ ->
+		    insert_in_order({Suite,SkipCases},Suites0,replace)
+	    end
     end.
 
 append(Elem, List) ->
     List ++ [Elem].
 
-insert_in_order([E|Es],List) ->
-    List1 = insert_elem(E,List,[]),
-    insert_in_order(Es,List1);
-insert_in_order([],List) ->
+insert_in_order(Elems,Dest) ->
+        insert_in_order1(Elems,Dest,false).
+
+insert_in_order(Elems,Dest,replace) ->
+    insert_in_order1(Elems,Dest,true).
+
+insert_in_order1([_E|Es],all,Replace) ->
+    insert_in_order1(Es,all,Replace);
+
+insert_in_order1([E|Es],List,Replace) ->
+    List1 = insert_elem(E,List,[],Replace),
+    insert_in_order1(Es,List1,Replace);
+insert_in_order1([],List,_Replace) ->
     List;
-insert_in_order(E,List) ->
-    insert_elem(E,List,[]).
+insert_in_order1(E,List,Replace) ->
+    insert_elem(E,List,[],Replace).
+
 
-%% replace an existing entry (same key) or add last in list
-insert_elem({Key,_}=E,[{Key,_}|Rest],SoFar) ->
+insert_elem({Key,_}=E,[{Key,_}|Rest],SoFar,true) ->
     lists:reverse([E|SoFar]) ++ Rest;
-insert_elem({E,_},[E|Rest],SoFar) ->
+insert_elem({E,_},[E|Rest],SoFar,true) ->
     lists:reverse([E|SoFar]) ++ Rest;
-insert_elem(E,[E|Rest],SoFar) ->
+insert_elem(E,[E|Rest],SoFar,true) ->
+    lists:reverse([E|SoFar]) ++ Rest;
+
+insert_elem({all,_}=E,_,SoFar,_Replace) ->
+    lists:reverse([E|SoFar]);
+insert_elem(_E,[all|_],SoFar,_Replace) ->
+    lists:reverse(SoFar);
+insert_elem(_E,[{all,_}],SoFar,_Replace) ->
+    lists:reverse(SoFar);
+insert_elem({Key,_}=E,[{Key,[]}|Rest],SoFar,_Replace) ->
     lists:reverse([E|SoFar]) ++ Rest;
-insert_elem(E,[E1|Rest],SoFar) ->
-    insert_elem(E,Rest,[E1|SoFar]);
-insert_elem(E,[],SoFar) ->
+insert_elem(E,[E1|Rest],SoFar,Replace) ->
+    insert_elem(E,Rest,[E1|SoFar],Replace);
+insert_elem(E,[],SoFar,_Replace) ->
     lists:reverse([E|SoFar]).
 
 ref2node(all_nodes,_Refs) ->