aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/skyframe
diff options
context:
space:
mode:
authorGravatar gregce <gregce@google.com>2018-05-23 12:44:23 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-05-23 12:45:38 -0700
commit1cc0decbb00b28659a44bf474737eae1f871ac42 (patch)
tree931f005b50e9e19143712d00ed13b6b73cad7d2e /src/test/java/com/google/devtools/build/lib/skyframe
parent29eafdfe329b300dc42fddafde87bddae2f07a4c (diff)
Simplify split transition semantics: noops now return the input build options.
This results in less special logic in the implementation and a simpler API. PiperOrigin-RevId: 197772283
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe')
-rw-r--r--src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
index 1fc5f6222a..3f5f37c02b 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
@@ -62,10 +62,10 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
return super.defaultFlags().with(Flag.TRIMMED_CONFIGURATIONS);
}
- private static class EmptySplitTransition implements SplitTransition {
+ private static class NoopSplitTransition implements SplitTransition {
@Override
public List<BuildOptions> split(BuildOptions buildOptions) {
- return ImmutableList.of();
+ return ImmutableList.of(buildOptions);
}
}
@@ -111,7 +111,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
"empty_split",
attr("with_empty_transition", LABEL)
.allowedFileTypes(FileTypeSet.ANY_FILE)
- .cfg(new EmptySplitTransition()));
+ .cfg(new NoopSplitTransition()));
/** Rule with a split transition on an attribute. */
private static final MockRule ATTRIBUTE_TRANSITION_RULE = () ->