1 files changed, 33 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
index ea9c9e9281..0d2f85b1cb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
@@ -18,6 +18,8 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.MoreCollectors;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.OptionsDiffPredicate;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelConverter;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
@@ -31,8 +33,10 @@ import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.util.RegexFilter;
 import com.google.devtools.common.options.Option;
+import com.google.devtools.common.options.OptionDefinition;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
+import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.OptionsParsingException;
 import com.google.devtools.common.options.TriState;
 import java.util.Collections;
@@ -43,8 +47,37 @@ import java.util.Set;
 /** Test-related options. */
 @AutoCodec
 public class TestConfiguration extends Fragment {
+  public static final OptionsDiffPredicate HAVE_OPTIONS_AFFECTING_NON_TEST_TARGETS_CHANGED =
+      (diff, options) -> {
+          if (!options.contains(TestOptions.class)) {
+            // if there's a diff and there are no test options, a non-test option definitely changed
+            return true;
+          }
+          if (!options.get(TestOptions.class).trimTestConfiguration) {
+            // if trimTestConfiguration is off, test options affect all targets
+            return true;
+          }
+          for (OptionDefinition changedOption : diff.getFirst().keySet()) {
+            if (TestOptions.TRIM_TEST_CONFIGURATION.equals(changedOption)) {
+              // toggling trimTestConfiguration affects all non-test targets
+              return true;
+            }
+            if (!changedOption.getField().getDeclaringClass().equals(TestOptions.class)) {
+              // only TestOptions are trimmed; options from other classes affect all targets
+              return true;
+            }
+          }
+          return false;
+      };
+
   /** Command-line options. */
   public static class TestOptions extends FragmentOptions {
+    private static final OptionDefinition TRIM_TEST_CONFIGURATION =
+        OptionsParser.getOptionDefinitions(TestOptions.class)
+            .stream()
+            .filter(definition -> definition.getOptionName().equals("trim_test_configuration"))
+            .collect(MoreCollectors.onlyElement());
+
     @Option(
       name = "test_filter",
       allowMultiple = false,