commit 6a3405b2defabc5fd069081af22de447268be219
author gregce <gregce@google.com> Thu Mar 19 12:58:30 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 19 12:59:55 2020 -0700
tree 57c6e1a2faade628aa0582d5d85158f591efd6a7
parent e59fe6cce12326ca1f6bac8f93aff4e944279662

Remove outdated test references to --experimental_disable_go

PiperOrigin-RevId: 301877761

src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
index e499a5d..d450d33 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
@@ -72,7 +72,6 @@
   public static ImmutableList<String> requiredObjcCrosstoolFlagsNoXcodeConfig() {
 
     ImmutableList.Builder<String> argsBuilder = ImmutableList.builder();
-    argsBuilder.addAll(TestConstants.OSX_CROSSTOOL_FLAGS);
 
     // TODO(b/68751876): Set --apple_crosstool_top and --crosstool_top using the
     // AppleCrosstoolTransition

src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java
index f697bca..92e033a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java
@@ -32,7 +32,6 @@
 import com.google.devtools.build.lib.rules.cpp.CppLinkAction;
 import com.google.devtools.build.lib.rules.cpp.Link;
 import com.google.devtools.build.lib.rules.cpp.LinkBuildVariablesTestCase;
-import com.google.devtools.build.lib.testutil.TestConstants;
 import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
@@ -64,7 +63,6 @@
   @Override
   protected void useConfiguration(String... args) throws Exception {
     ImmutableList<String> extraArgs = ImmutableList.<String>builder()
-        .addAll(TestConstants.OSX_CROSSTOOL_FLAGS)
         .add("--xcode_version_config=" + MockObjcSupport.XCODE_VERSION_CONFIG)
         .add("--apple_crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL)
         .add("--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL)

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 e972cad..108514c 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
@@ -126,12 +126,6 @@
   public static final String GENRULE_SETUP_PATH = "genrule-setup.sh";
 
   /**
-   * A list of flags required to support use of the crosstool on OSX.
-   */
-  public static final ImmutableList<String> OSX_CROSSTOOL_FLAGS =
-      ImmutableList.of();
-
-  /**
    * Flags that must be set for Bazel to work properly, if the default values are unusable for some
    * reason.
    */