diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/actions')
3 files changed, 9 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java index 1458fdf690..1849284908 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java @@ -67,7 +67,8 @@ public class ExecutableSymlinkActionTest { Artifact input = new Artifact(inputFile, inputRoot); Artifact output = new Artifact(outputFile, outputRoot); ExecutableSymlinkAction action = new ExecutableSymlinkAction(NULL_ACTION_OWNER, input, output); - action.execute(createContext()); + ActionResult actionResult = action.execute(createContext()); + assertThat(actionResult.spawnResults()).isEmpty(); assertThat(outputFile.resolveSymbolicLinks()).isEqualTo(inputFile); } 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 9e7f9b796c..4a58eae2b3 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 @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.ActionInputHelper; import com.google.devtools.build.lib.actions.ActionInputPrefetcher; 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.Artifact.ArtifactExpander; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; @@ -266,8 +267,8 @@ public final class ActionsTestUtil { } @Override - public void execute(ActionExecutionContext actionExecutionContext) { - + public ActionResult execute(ActionExecutionContext actionExecutionContext) { + return ActionResult.EMPTY; } @Override protected String computeKey() { diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java index f5c1a965a1..5f7a680537 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java +++ b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java @@ -19,6 +19,7 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.AbstractAction; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionExecutionException; +import com.google.devtools.build.lib.actions.ActionResult; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.Preconditions; @@ -90,7 +91,7 @@ public class TestAction extends AbstractAction { } @Override - public void execute(ActionExecutionContext actionExecutionContext) + public ActionResult execute(ActionExecutionContext actionExecutionContext) throws ActionExecutionException { for (Artifact artifact : getInputs()) { // Do not check *.optional artifacts - artifacts with such extension are @@ -120,6 +121,8 @@ public class TestAction extends AbstractAction { } catch (IOException e) { throw new AssertionError(e); } + + return ActionResult.EMPTY; } @Override |