File 0163-Fix-skip_groups-option-in-combination-with... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0163-Fix-skip_groups-option-in-combination-with-all-suite.patch of Package erlang (Revision 15b24e456ec31eded623c8b8a9e37cc4)

Currently displaying revision 15b24e456ec31eded623c8b8a9e37cc4 , Show latest

From addfce8dd629fd7807eae95086ecbf9686feee49 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Thu, 7 Dec 2017 12:05:30 +0100
Subject: [PATCH] Fix skip_groups option in combination with all suites in test
 spec

---
 lib/common_test/src/ct_testspec.erl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index bb445bb0d2..bd3755722f 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -1425,7 +1425,12 @@ skip_groups1(Suite,Groups,Cmt,Suites0) ->
 	    GrAndCases1 = GrAndCases0 ++ SkipGroups,
 	    insert_in_order({Suite,GrAndCases1},Suites0,replace);
 	false ->
-	    insert_in_order({Suite,SkipGroups},Suites0,replace)
+	    case Suites0 of
+		[{all,_}=All|Skips]->
+		    [All|Skips++[{Suite,SkipGroups}]];
+                _ ->
+                    insert_in_order({Suite,SkipGroups},Suites0,replace)
+            end
     end.
 
 skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,false) when is_list(Cases) ->
-- 
2.16.0

Places

File 0163-Fix-skip_groups-option-in-combination-with-all-suite.patch of Package erlang (Revision 15b24e456ec31eded623c8b8a9e37cc4)

Places