From 736cfaea8069781783a5039c9a942793c0c61245 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Wed, 14 Dec 2022 14:40:58 +0100
Subject: rules: Collect artifacts from "data" targets for test binaries

---
 CC/test/RULES | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'CC/test')

diff --git a/CC/test/RULES b/CC/test/RULES
index 4425fd6..3821339 100644
--- a/CC/test/RULES
+++ b/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"}
             }
           }
         ]
-- 
cgit v1.2.3