Some updates to MockCcSupport in preparation for open sourcing more CC tests.

--
MOS_MIGRATED_REVID=132537118

2 files changed, 10 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
index 192ce19bf6..75192ab4c6 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
@@ -18,7 +18,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
-
+import com.google.devtools.build.lib.cmdline.Label;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -133,11 +133,16 @@ public final class BazelMockCcSupport extends MockCcSupport {
   }
 
   @Override
-  protected String getMockCrosstoolVersion() {
+  public String getMockCrosstoolVersion() {
     return "gcc-4.4.0-glibc-2.3.6";
   }
 
   @Override
+  public Label getMockCrosstoolLabel() {
+    return Label.parseAbsoluteUnchecked("@bazel_tools//tools/cpp:toolchain");
+  }
+
+  @Override
   public String readCrosstoolFile() throws IOException {
     return readFromResources(MOCK_CROSSTOOL_PATH);
   }
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
index 9da6514969..b2eb70f0b0 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
@@ -500,7 +500,9 @@ public abstract class MockCcSupport {
     }
   }
 
-  protected abstract String getMockCrosstoolVersion();
+  public abstract String getMockCrosstoolVersion();
+
+  public abstract Label getMockCrosstoolLabel();
 
   public abstract String readCrosstoolFile() throws IOException;