diff options
author | 2016-09-29 01:01:57 +0000 | |
---|---|---|
committer | 2016-09-29 09:12:58 +0000 | |
commit | 9e26f0fe244075f583006049e5268146f1e2c5d5 (patch) | |
tree | 33a5debffee15d307473afa70ac194c467fe1e39 /src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java | |
parent | 593dc52c067a87b14e431c85a6acf051fb35ce38 (diff) |
Optimize how null configurations get created and add test infrastructure for Bazel's dep configuration creation logic.
This essentially implements the following TODOs:
https://github.com/bazelbuild/bazel/blob/bc6045dcc8fa33d4241d231138020ac4bdecc14f/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java#L599
https://github.com/bazelbuild/bazel/blob/bc6045dcc8fa33d4241d231138020ac4bdecc14f/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java#L42
--
MOS_MIGRATED_REVID=134607049
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java index 73642c5fe4..25d833c2c2 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java @@ -345,20 +345,15 @@ public class BuildViewTest extends BuildViewTestBase { Label.parseAbsolute("//package:inner"), Attribute.ConfigurationTransition.NONE, ImmutableSet.<AspectDescriptor>of()); - fileDependency = - Dependency.withTransitionAndAspects( - Label.parseAbsolute("//package:file"), - Attribute.ConfigurationTransition.NULL, - ImmutableSet.<AspectDescriptor>of()); } else { innerDependency = Dependency.withConfiguration( Label.parseAbsolute("//package:inner"), getTargetConfiguration()); - fileDependency = - Dependency.withNullConfiguration( - Label.parseAbsolute("//package:file")); } + fileDependency = + Dependency.withNullConfiguration( + Label.parseAbsolute("//package:file")); assertThat(targets).containsExactly(innerDependency, fileDependency); } |