diff options
| author | Jakub Witczak <u3s@users.noreply.github.com> | 2021-09-29 11:45:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 11:45:17 +0200 |
| commit | ddddb3f16c369b9ff0dfb6207689f99b5e4c9888 (patch) | |
| tree | 070d6dc461b1866b767d14df497d046f2526d197 /lib/common_test/src/ct_groups.erl | |
| parent | 7a8338768e0ee46cb0b02f4820998b82b5e9c200 (diff) | |
| parent | abe4546661ab940a6046994305b02c080690ad79 (diff) | |
| download | erlang-ddddb3f16c369b9ff0dfb6207689f99b5e4c9888.tar.gz | |
Merge pull request #5242 from acw224/acw224/common_test/group_parsing_modification
Common_test : Updated grammar for tests specifications
OTP-17664
Closes #5088
Diffstat (limited to 'lib/common_test/src/ct_groups.erl')
| -rw-r--r-- | lib/common_test/src/ct_groups.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl index b296939bd6..273a1acb12 100644 --- a/lib/common_test/src/ct_groups.erl +++ b/lib/common_test/src/ct_groups.erl @@ -550,11 +550,11 @@ search_and_override([Conf = {conf,Props,Init,Tests,End}], ORSpec, Mod) -> Suite = ?val(suite, Props), case lists:keysearch(Name, 1, ORSpec) of {value,{Name,default}} -> - [Conf]; + [{conf, Props, Init, search_and_override(Tests, ORSpec, Mod),End}]; {value,{Name,ORProps}} -> - [{conf,InsProps(Name,Suite,ORProps),Init,Tests,End}]; + [{conf,InsProps(Name,Suite,ORProps),Init, search_and_override(Tests, ORSpec, Mod),End}]; {value,{Name,default,[]}} -> - [Conf]; + [{conf, Props, Init, search_and_override(Tests, ORSpec, Mod),End}]; {value,{Name,default,SubORSpec}} -> override_props([Conf], SubORSpec, Name,Mod); {value,{Name,ORProps,SubORSpec}} -> @@ -562,7 +562,8 @@ search_and_override([Conf = {conf,Props,Init,Tests,End}], ORSpec, Mod) -> Init,Tests,End}], SubORSpec, Name,Mod); _ -> [{conf,Props,Init,search_and_override(Tests,ORSpec,Mod),End}] - end. + end; +search_and_override(Tests, _, _) -> Tests. %% Modify the Tests element according to the override specification override_props([{conf,Props,Init,Tests,End} | Confs], SubORSpec, Name,Mod) -> |