diff options
author | 2017-05-09 08:34:23 -0400 | |
---|---|---|
committer | 2017-05-09 10:55:15 -0400 | |
commit | c240b4c2057e8b757377219b6087034bfcdbec93 (patch) | |
tree | 5260af41c00212d28c3d4dd487734371785b5fde /src/main/java/com/google/devtools/build/lib/rules/test | |
parent | 20d545ecb95f0211dd203758e27a181f17dc455f (diff) |
Automated g4 rollback of commit 56e8d90674a35ebe727f74cd2d47108bfcaa4515.
*** Reason for rollback ***
Looks like it broke stuff - the presubmit bypass was added by accident.
*** Original change description ***
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 TestRunnerAc...
***
PiperOrigin-RevId: 155493797
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, 5 insertions, 3 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 a38cef2433..7f42c03889 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,6 +32,7 @@ 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; @@ -94,8 +95,8 @@ public final class BaselineCoverageAction extends AbstractFileWriteAction } @Override - public void actionCacheHit(ActionCachedContext context) { - notifyAboutBaselineCoverage(context.getEventBus()); + public void actionCacheHit(Executor executor) { + notifyAboutBaselineCoverage(executor.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 dec8790a47..6db48d097e 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,6 +25,7 @@ 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; @@ -300,7 +301,7 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa } @Override - public void actionCacheHit(ActionCachedContext executor) { + public void actionCacheHit(Executor executor) { unconditionalExecution = null; try { executor.getEventBus().post( |