Add feature to selectively disable Blaze's cc include scanner.

--
MOS_MIGRATED_REVID=122052211

2 files changed, 2 insertions, 1 deletions

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 92f979753e..93d62018f7 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 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     // 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 6dae07f5e5..c96a65e50b 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 class SkylarkRuleContextTest extends SkylarkTestCase {
   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");
   }