commit d521964f8606499c0335571cde64ee671ee643eb
author cushon <cushon@google.com> Wed Apr 03 17:38:12 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Apr 03 17:39:38 2019 -0700
tree be5d9a63198f4b533571db49f731ac5b4021fe42
parent fd0f049de699d4a6505130c4325dd0b57177de26

Enable --incompatible_use_toolchain_resolution_for_java_rules in tests

PiperOrigin-RevId: 241840634

src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java

diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
index bb7d069..b4e8e9d 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
@@ -120,7 +120,9 @@
       ImmutableList.of(
           // TODO(#7903): Remove once our own tests are migrated.
           "--incompatible_py3_is_default=false",
-          "--incompatible_py2_outputs_are_suffixed=false");
+          "--incompatible_py2_outputs_are_suffixed=false",
+          // TODO(#7849): Remove after flag flip.
+          "--incompatible_use_toolchain_resolution_for_java_rules");
 
   public static final BuilderFactoryForTesting PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING =
       PackageFactoryBuilderFactoryForBazelUnitTests.INSTANCE;