aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Carmi Grushko <carmi@google.com>2016-03-18 19:04:57 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-03-21 09:35:09 +0000
commit27ec632c88ef228f4dee32b41ec7269ac749da28 (patch)
treeee9b79d5db388bfabba3842845b5c7674773ad92
parentbb2f07124c7ebf5cb28c8cd4b57cf6156c1c7b0d (diff)
Add a getGeneratingAction(ConfiguredTarget target, String outputName) method to BuildViewTestCase.
-- MOS_MIGRATED_REVID=117571330
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index c2b8333635..7ad0832281 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -520,6 +520,17 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
return getActionGraph().getGeneratingAction(artifact);
}
+ protected Action getGeneratingAction(ConfiguredTarget target, String outputName) {
+ NestedSet<Artifact> filesToBuild = getFilesToBuild(target);
+ Artifact artifact = Iterables.find(filesToBuild, artifactNamed(outputName), null);
+ if (artifact == null) {
+ fail(
+ String.format(
+ "Artifact named '%s' not found in filesToBuild (%s)", outputName, filesToBuild));
+ }
+ return getGeneratingAction(artifact);
+ }
+
/**
* Returns the SpawnAction that generates an artifact.
* Implicitly assumes the action is a SpawnAction.
@@ -528,6 +539,11 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
return (SpawnAction) getGeneratingAction(artifact);
}
+ protected SpawnAction getGeneratingSpawnAction(ConfiguredTarget target, String outputName) {
+ return getGeneratingSpawnAction(
+ Iterables.find(getFilesToBuild(target), artifactNamed(outputName)));
+ }
+
protected void simulateLoadingPhase() {
try {
ensureTargetsVisited(targetConfig.getAllLabels().values());
@@ -1394,11 +1410,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
return result;
}
- protected SpawnAction getGeneratingSpawnAction(ConfiguredTarget target, String outputName) {
- return getGeneratingSpawnAction(
- Iterables.find(getFilesToBuild(target), artifactNamed(outputName)));
- }
-
protected String getErrorMsgSingleFile(String attrName, String ruleType, String ruleName,
String depRuleName) {
return "in " + attrName + " attribute of " + ruleType + " rule " + ruleName + ": '"