aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2018-01-26 10:58:17 +0100
committerPeter Andersson <[email protected]>2018-01-26 10:58:17 +0100
commite12be4b294f1ae82023cc50399ce17e5eb7e4c35 (patch)
treefcec4808c81dc54bd0b973a28c5026f4fb884f49 /lib
parentb171521e68262b9a830e8b8dd98467097d283753 (diff)
parentaddfce8dd629fd7807eae95086ecbf9686feee49 (diff)
downloadotp-e12be4b294f1ae82023cc50399ce17e5eb7e4c35.tar.gz
otp-e12be4b294f1ae82023cc50399ce17e5eb7e4c35.tar.bz2
otp-e12be4b294f1ae82023cc50399ce17e5eb7e4c35.zip
Merge branch 'peppe/common_test/skip_groups_in_spec' into maint
* peppe/common_test/skip_groups_in_spec: Fix skip_groups option in combination with all suites in test spec
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct_testspec.erl7
1 files changed, 6 insertions, 1 deletions
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) ->