Remove duplication in java_test attributes

PiperOrigin-RevId: 517446899 Change-Id: I0d66d28bda567f299fa4ee121de0ad2a72b70bc6
bazelbuild · Mar 17, 2023 · 571b16e · 571b16e
1 parent 7f8356e
commit 571b16e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl b/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl
@@ -16,9 +16,8 @@ load(":common/rule_util.bzl", "merge_attrs")
 load(":common/java/java_util.bzl", "shell_quote")
 load(":common/java/java_semantics.bzl", "semantics")
 load(":common/cc/cc_helper.bzl", "cc_helper")
-load(":common/cc/semantics.bzl", cc_semantics = "semantics")
 load(":common/java/java_helper.bzl", helper = "util")
-load(":common/java/java_binary.bzl", "BASIC_JAVA_BINARY_ATTRIBUTES", "basic_java_binary")
+load(":common/java/java_binary.bzl", "BASE_TEST_ATTRIBUTES", "BASIC_JAVA_BINARY_ATTRIBUTES", "basic_java_binary")
 load(":common/paths.bzl", "paths")
 
 JavaInfo = _builtins.toplevel.JavaInfo
@@ -311,9 +310,9 @@ def make_java_test(resolve_launcher_flag, has_launcher = False):
     return _make_binary_rule(
         _bazel_java_test_impl,
         merge_attrs(
+            BASE_TEST_ATTRIBUTES,
             _BASE_BINARY_ATTRS,
             {
-                "test_class": attr.string(),
                 "_java_launcher": attr.label(
                     default = configuration_field(
                         fragment = "java",
@@ -332,14 +331,6 @@ def make_java_test(resolve_launcher_flag, has_launcher = False):
                     allow_single_file = True,
                     default = "@bazel_tools//tools/test:collect_cc_coverage",
                 ),
-                "_apple_constraints": attr.label_list(
-                    default = [
-                        "@" + paths.join(cc_semantics.get_platforms_root(), "os:ios"),
-                        "@" + paths.join(cc_semantics.get_platforms_root(), "os:macos"),
-                        "@" + paths.join(cc_semantics.get_platforms_root(), "os:tvos"),
-                        "@" + paths.join(cc_semantics.get_platforms_root(), "os:watchos"),
-                    ],
-                ),
             },
             override_attrs = {
                 "use_testrunner": attr.bool(default = True),

diff --git a/src/main/starlark/builtins_bzl/common/java/java_binary.bzl b/src/main/starlark/builtins_bzl/common/java/java_binary.bzl
@@ -23,6 +23,7 @@ load(":common/cc/cc_helper.bzl", "cc_helper")
 load(":common/cc/semantics.bzl", cc_semantics = "semantics")
 load(":common/proto/proto_info.bzl", "ProtoInfo")
 load(":common/cc/cc_info.bzl", "CcInfo")
+load(":common/paths.bzl", "paths")
 
 CcLauncherInfo = _builtins.internal.cc_internal.launcher_provider
 JavaInfo = _builtins.toplevel.JavaInfo
@@ -542,3 +543,16 @@ BASIC_JAVA_BINARY_ATTRIBUTES = merge_attrs(
         "_java_runtime_toolchain_type": attr.label(default = semantics.JAVA_RUNTIME_TOOLCHAIN_TYPE),
     },
 )
+
+BASE_TEST_ATTRIBUTES = {
+    "test_class": attr.string(),
+    "env_inherit": attr.string_list(),
+    "_apple_constraints": attr.label_list(
+        default = [
+            "@" + paths.join(cc_semantics.get_platforms_root(), "os:ios"),
+            "@" + paths.join(cc_semantics.get_platforms_root(), "os:macos"),
+            "@" + paths.join(cc_semantics.get_platforms_root(), "os:tvos"),
+            "@" + paths.join(cc_semantics.get_platforms_root(), "os:watchos"),
+        ],
+    ),
+}