diff options
| author | Peter Andersson <[email protected]> | 2011-12-09 13:39:17 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-12-09 13:39:26 +0100 |
| commit | 8cca19aecb36ad6da7ea506ba886a56253917e22 (patch) | |
| tree | 28a66334246ecee30c14388a079c8126bf54463a /lib/common_test/src/ct_testspec.erl | |
| parent | 4743d3991ee56e5989563dde61bce91d625a05f4 (diff) | |
| parent | 0c5481927c9b187d9f8bdb10bc12fd94f5923691 (diff) | |
| download | otp-8cca19aecb36ad6da7ea506ba886a56253917e22.tar.gz otp-8cca19aecb36ad6da7ea506ba886a56253917e22.tar.bz2 otp-8cca19aecb36ad6da7ea506ba886a56253917e22.zip | |
Merge remote branch 'origin/peppe/common_test/groups'
* origin/peppe/common_test/groups:
Change init/end_per_group/0 -> init/end_per_group/1
Add config info suite
Add tests for group specification and info function
Implement support for overriding group properties with test specification
Implement support for overriding group properties with all/0
Implement the group info function
OTP-9235
OTP-9569
OTP-9809
Diffstat (limited to 'lib/common_test/src/ct_testspec.erl')
| -rw-r--r-- | lib/common_test/src/ct_testspec.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl index 317910d5c8..b68cbd3aa1 100644 --- a/lib/common_test/src/ct_testspec.erl +++ b/lib/common_test/src/ct_testspec.erl @@ -878,7 +878,11 @@ separate([],_,_,_) -> %% {Suite2,[GrOrCase21,GrOrCase22,...]},...]} %% {{Node,Dir},[{Suite1,{skip,Cmt}}, %% {Suite2,[{GrOrCase21,{skip,Cmt}},GrOrCase22,...]},...]} -%% GrOrCase = {GroupName,[Case1,Case2,...]} | Case +%% GrOrCase = {GroupSpec,[Case1,Case2,...]} | Case +%% GroupSpec = {GroupName,OverrideProps} | +%% {GroupName,OverrideProps,SubGroupSpec} +%% OverrideProps = Props | default +%% SubGroupSpec = GroupSpec | [] insert_suites(Node,Dir,[S|Ss],Tests, MergeTests) -> Tests1 = insert_cases(Node,Dir,S,all,Tests,MergeTests), @@ -889,7 +893,7 @@ insert_suites(Node,Dir,S,Tests,MergeTests) -> insert_suites(Node,Dir,[S],Tests,MergeTests). insert_groups(Node,Dir,Suite,Group,Cases,Tests,MergeTests) - when is_atom(Group) -> + when is_atom(Group); is_tuple(Group) -> insert_groups(Node,Dir,Suite,[Group],Cases,Tests,MergeTests); insert_groups(Node,Dir,Suite,Groups,Cases,Tests,false) when ((Cases == all) or is_list(Cases)) and is_list(Groups) -> |