Add feature to selectively disable Blaze's cc include scanner. -- MOS_MIGRATED_REVID=122052211
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 92f9797..93d6201 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -277,6 +277,7 @@ // TODO(dmarting): Add --stamp option only to test that requires it. configurationArgs.add("--stamp"); // Stamp is now defaulted to false. configurationArgs.add("--experimental_extended_sanity_checks"); + configurationArgs.add("--features=cc_include_scanning"); configurationArgs.addAll(getAnalysisMock().getOptionOverrides()); optionsParser.parse(configurationArgs);
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index 6dae07f..c96a65e 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
@@ -694,7 +694,7 @@ public void testFeatures() throws Exception { SkylarkRuleContext ruleContext = createRuleContext("//foo:cc_with_features"); Object result = evalRuleContextCode(ruleContext, "ruleContext.features"); - assertThat((SkylarkList) result).containsExactly("f1", "f2"); + assertThat((SkylarkList) result).containsExactly("cc_include_scanning", "f1", "f2"); }