diff options
author | ulfjack <ulfjack@google.com> | 2017-05-10 06:52:23 -0400 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2017-05-10 13:37:22 -0400 |
commit | 889bbe55d21d646d45c99208d595c7b9566ea662 (patch) | |
tree | dc51ad2308d9b1a897c1bc51cef50a95f4585e44 /src/main/java/com/google/devtools/build/lib/rules/test | |
parent | f2014a17a2541d98cf319c322ac461cec8082945 (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: 155612573
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.java | 5 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java | 3 |
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( |