1 files changed, 6 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
index f03dcaff33..3548b9aafc 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
@@ -29,6 +29,7 @@ import com.google.devtools.build.lib.actions.ActionKeyContext;
 import com.google.devtools.build.lib.actions.ActionOwner;
 import com.google.devtools.build.lib.actions.ActionResult;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.ArtifactPathResolver;
 import com.google.devtools.build.lib.actions.CommandLineExpansionException;
 import com.google.devtools.build.lib.actions.ExecException;
 import com.google.devtools.build.lib.actions.NotifyOnActionCacheHit;
@@ -240,14 +241,14 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
    */
   // TODO(ulfjack): Instead of going to local disk here, use SpawnResult (add list of files there).
   public ImmutableList<Pair<String, Path>> getTestOutputsMapping(
-      @Nullable ActionExecutionContext context, Path execRoot) {
+      ArtifactPathResolver resolver, Path execRoot) {
     ImmutableList.Builder<Pair<String, Path>> builder = ImmutableList.builder();
-    if (convertPath(context, getTestLog()).exists()) {
-      builder.add(Pair.of(TestFileNameConstants.TEST_LOG, convertPath(context, getTestLog())));
+    if (resolver.toPath(getTestLog()).exists()) {
+      builder.add(Pair.of(TestFileNameConstants.TEST_LOG, resolver.toPath(getTestLog())));
     }
-    if (getCoverageData() != null && convertPath(context, getCoverageData()).exists()) {
+    if (getCoverageData() != null && resolver.toPath(getCoverageData()).exists()) {
       builder.add(Pair.of(TestFileNameConstants.TEST_COVERAGE,
-          convertPath(context, getCoverageData())));
+          resolver.toPath(getCoverageData())));
     }
     if (execRoot != null) {
       ResolvedPaths resolvedPaths = resolve(execRoot);
@@ -295,13 +296,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
     return builder.build();
   }
 
-  private static Path convertPath(@Nullable ActionExecutionContext actionContext,
-      Artifact artifact) {
-    return actionContext == null
-        ? artifact.getPath()
-        : actionContext.getInputPath(artifact);
-  }
-
   @Override
   protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
       throws CommandLineExpansionException {