diff options
| author | Peter Andersson <[email protected]> | 2010-06-29 18:03:09 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2010-07-06 02:44:27 +0200 |
| commit | 79851b599df5caf5e2101d834a843e3837c6a6ae (patch) | |
| tree | 8490cb6a80e20838bb3a6b091ed9f132f9b4ceea /lib/common_test/src/ct_run.erl | |
| parent | 31b52954dc667861a2e7cd4edba100132499cd5f (diff) | |
| download | otp-79851b599df5caf5e2101d834a843e3837c6a6ae.tar.gz otp-79851b599df5caf5e2101d834a843e3837c6a6ae.tar.bz2 otp-79851b599df5caf5e2101d834a843e3837c6a6ae.zip | |
Improve handling of test case group specifications
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 0b4a508321..2591890898 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -1434,14 +1434,17 @@ final_tests1([{TestDir,Suite,GrsOrCs}|Tests], Final, Skip, Bad) when final_tests1(Tests, [{TestDir,Suite,all}|Final], Skip1, Bad); false -> GrsOrCs1 = - lists:map( + lists:flatmap( %% for now, only flat group defs are allowed as %% start options and test spec terms - fun({Group,TCs}) -> - ct_framework:make_conf(TestDir, Suite, - Group, [], TCs); + fun({all,all}) -> + ct_framework:make_all_conf(TestDir, + Suite, []); + ({Group,TCs}) -> + [ct_framework:make_conf(TestDir, Suite, + Group, [], TCs)]; (TC) -> - TC + [TC] end, GrsOrCs), Do = {TestDir,Suite,GrsOrCs1}, final_tests1(Tests, [Do|Final], Skip, Bad) |