Flip --@bazel_tools//tools/test:incompatible_use_default_test_toolchain

fmeum · copybara-github · commit 0dd0da99799b · 2025-04-14T09:01:14.000-07:00
Fixes bazelbuild#25823 RELNOTES[inc]: `--@bazel_tools//tools/test:incompatible_use_default_test_toolchain` is now enabled by default. All test rules without an explicitly defined `test` exec group now select an execution platform that satisfies all constraints of the target platform. The `--use_target_platform_for_tests` option, which served a similar purpose, is now deprecated. See bazelbuild#25823 for more details and migration advice. Closes bazelbuild#25821. PiperOrigin-RevId: 747439988 Change-Id: Ia0c3c8463be85ed60ca456ef6887ca4a92045e65
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
@@ -953,6 +953,10 @@ public OutputPathsConverter() {
   // target.
   @Option(
       name = "use_target_platform_for_tests",
+      deprecationWarning =
+          "Tests select an execution platform matching all constraints of the target platform by"
+              + " default. Instead of using this flag, make sure that all test target platform are"
+              + " registered as execution platforms.",
       defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
       effectTags = {OptionEffectTag.EXECUTION},
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -128,7 +128,7 @@ def _impl(ctx):
         """);
     config.create(
         "embedded_tools/tools/jdk/BUILD",
-        """
+"""
 load("@rules_java//java:defs.bzl",
   "java_binary", "java_import", "java_toolchain", "java_runtime")
 load(
@@ -316,7 +316,7 @@ def _impl(ctx):
 
         bool_flag(
             name = "incompatible_use_default_test_toolchain",
-            build_setting_default = False,
+            build_setting_default = True,
             visibility = ["//visibility:private"],
         )
 
diff --git a/tools/test/BUILD.tools b/tools/test/BUILD.tools
@@ -29,7 +29,7 @@ empty_toolchain(name = "empty_toolchain")
 # platform.
 bool_flag(
     name = "incompatible_use_default_test_toolchain",
-    build_setting_default = False,
+    build_setting_default = True,
     visibility = ["//visibility:private"],
 )
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ empty_toolchain(name = "empty_toolchain")`
`29`	`29`	`# platform.`
`30`	`30`	`bool_flag(`
`31`	`31`	`name = "incompatible_use_default_test_toolchain",`
`32`		`- build_setting_default = False,`
	`32`	`+ build_setting_default = True,`
`33`	`33`	`visibility = ["//visibility:private"],`
`34`	`34`	`)`
`35`	`35`