diff options
| author | Peter Andersson <[email protected]> | 2016-03-08 15:27:59 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-03-08 15:27:59 +0100 |
| commit | 98518999e43921de723f9057e8405c889d020500 (patch) | |
| tree | b3eb8eb502e84ded18d31badb4de10ce989411f7 /lib/common_test/src/ct_run.erl | |
| parent | 92573ea08320c05f233e978aba2aa7a4463b3617 (diff) | |
| parent | d524390a550b9c43d628ea140a665b0e62aa51de (diff) | |
| download | otp-98518999e43921de723f9057e8405c889d020500.tar.gz otp-98518999e43921de723f9057e8405c889d020500.tar.bz2 otp-98518999e43921de723f9057e8405c889d020500.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 39b2c2a8cd..e156c9b773 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, |