Move more things from TestConstants to AnalysisMock and LoadingMock.

Also remove other uses of TestConstants.

--
MOS_MIGRATED_REVID=127327339

2 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
index 6a53d7daf0..a98be78213 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.exec;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -43,8 +44,8 @@ import java.util.List;
  * Used to generate runfiles and fileset symlink farms.
  */
 public final class SymlinkTreeHelper {
-
-  private static final String BUILD_RUNFILES = "build-runfiles" + OsUtils.executableExtension();
+  @VisibleForTesting
+  public static final String BUILD_RUNFILES = "build-runfiles" + OsUtils.executableExtension();
 
   /**
    * These actions run faster overall when serialized, because most of their
diff --git a/src/main/java/com/google/devtools/build/lib/flags/InvocationPolicyEnforcer.java b/src/main/java/com/google/devtools/build/lib/flags/InvocationPolicyEnforcer.java
index c73dd5df06..b9307c4976 100644
--- a/src/main/java/com/google/devtools/build/lib/flags/InvocationPolicyEnforcer.java
+++ b/src/main/java/com/google/devtools/build/lib/flags/InvocationPolicyEnforcer.java
@@ -104,6 +104,10 @@ public final class InvocationPolicyEnforcer {
     this.invocationPolicy = invocationPolicy;
   }
 
+  public InvocationPolicy getInvocationPolicy() {
+    return invocationPolicy;
+  }
+
   /**
    * Applies this OptionsPolicyEnforcer's policy to the given OptionsParser for all blaze commands.
    *