diff options
author | 2016-06-06 18:52:08 +0000 | |
---|---|---|
committer | 2016-06-07 07:48:39 +0000 | |
commit | 73876205d11794a5b748dc3e800261c0f459ef76 (patch) | |
tree | 641af04fa8d3d502c3842bbc4991ab3b1850d960 /src/test/java/com/google/devtools/build/lib/actions/util | |
parent | 2410ef4c777c6b4db397365ae5b78af3a9b3c446 (diff) |
Skyframe changes to support SpawnActionTemplate.
1. Adds ActionTemplateExpansion{Function, Value} for ActionTemplate expansion.
2. Changes ArtifactFunction to support evaluating TreeFileArtifacts and TreeArtifacts generated by ActionTemplate.
--
MOS_MIGRATED_REVID=124160939
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 | 18 |
1 files changed, 18 insertions, 0 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 0ba8f7a20c..f6782e4c32 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 @@ -32,6 +32,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.Artifact.ArtifactExpander; +import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; import com.google.devtools.build.lib.actions.ArtifactOwner; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.MutableActionGraph; @@ -39,6 +40,9 @@ import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictEx import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.actions.cache.MetadataHandler; +import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; +import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate; +import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate.OutputPathMapper; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.exec.SingleBuildFileCache; @@ -525,4 +529,18 @@ public final class ActionsTestUtil { throw new UncheckedActionConflictException(e); } } + + public static SpawnActionTemplate createDummySpawnActionTemplate( + Artifact inputTreeArtifact, Artifact outputTreeArtifact) { + return new SpawnActionTemplate.Builder(inputTreeArtifact, outputTreeArtifact) + .setCommandLineTemplate(CustomCommandLine.builder().build()) + .setExecutable(new PathFragment("bin/executable")) + .setOutputPathMapper(new OutputPathMapper() { + @Override + public PathFragment parentRelativeOutputPath(TreeFileArtifact inputTreeFileArtifact) { + return inputTreeFileArtifact.getParentRelativePath(); + } + }) + .build(NULL_ACTION_OWNER); + } } |