aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2018-01-26 11:00:20 +0100
committerPeter Andersson <[email protected]>2018-01-26 11:00:20 +0100
commit6067c503ec651cd204c81531791188c0a2fa6394 (patch)
tree1f2306457c9b60cd64dafab37dcbb1a46dfb8201 /lib
parent5b58d9e2d3262160b7f10d8b6798f89f0618c5f6 (diff)
parente12be4b294f1ae82023cc50399ce17e5eb7e4c35 (diff)
downloadotp-6067c503ec651cd204c81531791188c0a2fa6394.tar.gz
otp-6067c503ec651cd204c81531791188c0a2fa6394.tar.bz2
otp-6067c503ec651cd204c81531791188c0a2fa6394.zip
Merge branch 'maint'
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) ->