diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-12-14 14:40:58 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-12-14 15:45:57 +0100 |
| commit | 441d211fd6194f79303edf8c2b83efae18b32f2e (patch) | |
| tree | 8bf96af47937d9a27381e3970670ed306413594f /rules | |
| parent | bf7280d8b2e98b4a6d71c1a4678e8899e62ba953 (diff) | |
| download | justbuild-441d211fd6194f79303edf8c2b83efae18b32f2e.tar.gz | |
rules: Collect artifacts from "data" targets for test binaries
Diffstat (limited to 'rules')
| -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 4425fd6a..38213392 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"} } } ] |