diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-12-14 15:48:58 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-12-14 15:48:58 +0100 |
| commit | 86144c718100d4b424d95a187c3ed4b9ffb04e8d (patch) | |
| tree | dbbb9dd54a3ee49f6a565026a910e514c0ac4359 /rules/CC/test | |
| parent | 886c7b680928276d7f925d30fc206ca27d9a97d1 (diff) | |
| parent | b1859c1ba4229812497da501e2843ab20d27682b (diff) | |
| download | rules-cc-86144c718100d4b424d95a187c3ed4b9ffb04e8d.tar.gz | |
Merge commit 'b1859c1ba4229812497da501e2843ab20d27682b' into rules
Diffstat (limited to 'rules/CC/test')
| -rw-r--r-- | rules/CC/test/RULES | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/rules/CC/test/RULES b/rules/CC/test/RULES index 4425fd6..3821339 100644 --- a/rules/CC/test/RULES +++ b/rules/CC/test/RULES @@ -96,7 +96,7 @@ ] , "imports": { "artifacts": ["./", "../..", "field_artifacts"] - , "runfiles_list": ["./", "../..", "field_runfiles_list"] + , "runfiles": ["./", "../..", "field_runfiles"] , "compile-deps": ["./", "..", "compile-deps"] , "compile-args-deps": ["./", "..", "compile-args-deps"] , "link-deps": ["./", "..", "link-deps"] @@ -242,15 +242,17 @@ } ] , [ "data" - , { "type": "disjoint_map_union" - , "msg": "Data runfiles may not conflict" - , "$1": - { "type": "let*" - , "bindings": - [ ["fieldname", "data"] - , ["transition", {"type": "var", "name": "deps-transition"}] + , { "type": "let*" + , "bindings": + [ ["fieldname", "data"] + , ["transition", {"type": "var", "name": "deps-transition"}] + ] + , "body": + { "type": "map_union" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "runfiles"} + , {"type": "CALL_EXPRESSION", "name": "artifacts"} ] - , "body": {"type": "CALL_EXPRESSION", "name": "runfiles_list"} } } ] |