From 2d40c22c2ecc5738d093d31a48fab1fb6779405d Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 3 Apr 2024 12:14:35 -0700 Subject: test_mappings: remove //common reference. We do not want to hardcode //common for anything part of Kleaf tooling, because ACK could be checked out elsewhere. Instead, create a pkg_filegroup so it can be the pkg_zip can refer to them in the //common package. Test: TH Bug: 327493370 Change-Id: Ic8dab284353b20befade6fe5c54f9813adde3e7c --- test_mappings/BUILD.bazel | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test_mappings/BUILD.bazel b/test_mappings/BUILD.bazel index fe5da35..ad36d99 100644 --- a/test_mappings/BUILD.bazel +++ b/test_mappings/BUILD.bazel @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_pkg//pkg:pkg.bzl", "pkg_zip") +load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup") # Collect into a .zip file the TEST_MAPPING files for packages whose tests # should be run in kernel presubmit and postsubmit testing. @@ -51,10 +51,12 @@ load("@rules_pkg//pkg:pkg.bzl", "pkg_zip") # renames = {file: file for file in _TEST_MAPPINGS}, # visibility = ["//kernel/tests/test_mappings:__pkg__"], # ) -pkg_zip( - name = "test_mappings_zip", + +# All interesting test_mappings targets, except the one in the kernel tree +# (usually //common). +pkg_filegroup( + name = "non_kernel_test_mappings", srcs = [ - "//common:test_mappings", "//external/zlib:test_mappings", "//kernel/tests/net/test:test_mappings", # Drop prebuilts/rust/TEST_MAPPING because: @@ -64,6 +66,5 @@ pkg_zip( # TODO(b/330775243): Add it back after main-kernel-build-2024 cut over. # "//prebuilts/rust:test_mappings", ], - out = "test_mappings.zip", visibility = ["//visibility:public"], ) -- cgit v1.2.3