diff options
| author | Peter Andersson <[email protected]> | 2012-11-15 17:36:08 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-11-19 11:29:25 +0100 |
| commit | 0034dfc83ad3f18a67df38b4414fe74be7cbcdf6 (patch) | |
| tree | 9d76b120f6960098b753987470e8a42139baf25f /lib/common_test/src/ct_testspec.erl | |
| parent | 0139043d48c692c0f0835d389f4e6ecaa38e8692 (diff) | |
| download | otp-0034dfc83ad3f18a67df38b4414fe74be7cbcdf6.tar.gz otp-0034dfc83ad3f18a67df38b4414fe74be7cbcdf6.tar.bz2 otp-0034dfc83ad3f18a67df38b4414fe74be7cbcdf6.zip | |
Finish the test suite and correct remaining bugs
OTP-10466
Diffstat (limited to 'lib/common_test/src/ct_testspec.erl')
| -rw-r--r-- | lib/common_test/src/ct_testspec.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl index 321af66dbb..5ce095e38e 100644 --- a/lib/common_test/src/ct_testspec.erl +++ b/lib/common_test/src/ct_testspec.erl @@ -1026,20 +1026,24 @@ insert_groups(Node,Dir,Suite,Group,Cases,Tests,MergeTests) 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) -> - Groups1 = [{Gr,Cases} || Gr <- Groups], + Groups1 = [if is_list(Gr) -> % preserve group path + {[Gr],Cases}; + true -> + {Gr,Cases} end || Gr <- Groups], append({{Node,Dir},[{Suite,Groups1}]},Tests); insert_groups(Node,Dir,Suite,Groups,Cases,Tests,true) when ((Cases == all) or is_list(Cases)) and is_list(Groups) -> + Groups1 = [if is_list(Gr) -> % preserve group path + {[Gr],Cases}; + true -> + {Gr,Cases} end || Gr <- Groups], case lists:keysearch({Node,Dir},1,Tests) of {value,{{Node,Dir},[{all,_}]}} -> Tests; {value,{{Node,Dir},Suites0}} -> - Suites1 = insert_groups1(Suite, - [{Gr,Cases} || Gr <- Groups], - Suites0), + Suites1 = insert_groups1(Suite,Groups1,Suites0), insert_in_order({{Node,Dir},Suites1},Tests); false -> - Groups1 = [{Gr,Cases} || Gr <- Groups], insert_in_order({{Node,Dir},[{Suite,Groups1}]},Tests) end; insert_groups(Node,Dir,Suite,Groups,Case,Tests, MergeTests) |