diff options
author | 2016-02-26 02:04:26 +0000 | |
---|---|---|
committer | 2016-02-26 10:08:37 +0000 | |
commit | 76139f29ca42f68f282f54531f4752d6091a831f (patch) | |
tree | a5900941f41ac552a33571c3017a706755fb949c /src/test/java/com/google/devtools/build/lib/actions/util | |
parent | 5909d9dc9ee0248a45cfbbc0ed2123e84824c2a1 (diff) |
Simplifies AbstractWriteFileAction to pass the ActionExecutionContext directly to newDeterministicWriter.
--
MOS_MIGRATED_REVID=115626619
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/actions/util')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java | 7 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java | 18 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java index 38aad5ce28..00b1fccff6 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java @@ -87,7 +87,8 @@ public final class ActionsTestUtil { return new ActionExecutionContext( executor, new SingleBuildFileCache(execRoot.getPathString(), execRoot.getFileSystem()), - metadataHandler, fileOutErr, + metadataHandler, + fileOutErr, actionGraph == null ? null : ActionInputHelper.actionGraphArtifactExpander(actionGraph)); @@ -102,7 +103,11 @@ public final class ActionsTestUtil { metadataHandler, fileOutErr, new BlockingSkyFunctionEnvironment(buildDriver, executor == null ? null : executor.getEventHandler())); + } + public static ActionExecutionContext createContext(EventHandler eventHandler) { + DummyExecutor dummyExecutor = new DummyExecutor(eventHandler); + return new ActionExecutionContext(dummyExecutor, null, null, null, null); } diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java b/src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java index ee6f4dafa9..606fe159e9 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java +++ b/src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java @@ -25,15 +25,23 @@ import com.google.devtools.common.options.OptionsClassProvider; * A dummy implementation of Executor. */ public final class DummyExecutor implements Executor { + private final Path inputDir; + private final EventHandler eventHandler; - /** - * @param inputDir - */ public DummyExecutor(Path inputDir) { - this.inputDir = inputDir; + this(inputDir, null); + } + + public DummyExecutor(EventHandler eventHandler) { + this(null, eventHandler); } + public DummyExecutor(Path inputDir, EventHandler eventHandler) { + this.inputDir = inputDir; + this.eventHandler = eventHandler; + } + @Override public Path getExecRoot() { return inputDir; @@ -56,7 +64,7 @@ public final class DummyExecutor implements Executor { @Override public EventHandler getEventHandler() { - throw new UnsupportedOperationException(); + return eventHandler; } @Override |