aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/test
diff options
context:
space:
mode:
authorGravatar ulfjack <ulfjack@google.com>2017-05-09 08:11:07 -0400
committerGravatar Kristina Chodorow <kchodorow@google.com>2017-05-09 10:54:52 -0400
commitf49f2be40936666f91eff452187be8d8e2ae7dcf (patch)
tree33fe56e588ca11cec480d37b1c2463b9105bf59c /src/main/java/com/google/devtools/build/lib/rules/test
parent2e62a044b1528c03e79b0a104100c6d5643e37ec (diff)
Add a custom interface for cache hit processing in actions
The new interface mirrors ActionExecutionContext, but is restricted to exactly the parts used right now. I did consider using ActionExecutionContext, but it contains some parts that we don't want to make available for cache hits. The end goal is to allow the build event stream access to artifact metadata, in particular for TestResult and TestSummary events, which in turn requires making artifact metadata available when the TestRunnerAction is a cache hit. PiperOrigin-RevId: 155492447
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/test')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java5
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java3
2 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java
index 7f42c03889..a38cef2433 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java
@@ -32,7 +32,6 @@ import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.vfs.PathFragment;
-
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
@@ -95,8 +94,8 @@ public final class BaselineCoverageAction extends AbstractFileWriteAction
}
@Override
- public void actionCacheHit(Executor executor) {
- notifyAboutBaselineCoverage(executor.getEventBus());
+ public void actionCacheHit(ActionCachedContext context) {
+ notifyAboutBaselineCoverage(context.getEventBus());
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
index 6db48d097e..dec8790a47 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
@@ -25,7 +25,6 @@ import com.google.devtools.build.lib.actions.ActionInputHelper;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ExecException;
-import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.NotifyOnActionCacheHit;
import com.google.devtools.build.lib.actions.UserExecException;
import com.google.devtools.build.lib.analysis.RunfilesSupplierImpl;
@@ -301,7 +300,7 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
}
@Override
- public void actionCacheHit(Executor executor) {
+ public void actionCacheHit(ActionCachedContext executor) {
unconditionalExecution = null;
try {
executor.getEventBus().post(