diff options
author | gregce <gregce@google.com> | 2017-07-06 18:44:38 -0400 |
---|---|---|
committer | John Cater <jcater@google.com> | 2017-07-07 07:08:19 -0400 |
commit | 490b0956e6cc8449072f3010c5197d9d6c621d09 (patch) | |
tree | 93e46e560d7ba8cb974e2a87124282056a9e5ff5 /src/test/java/com/google/devtools | |
parent | 5ba65a5c00f18a5ebd677ce10693b453736915f9 (diff) |
Factor out BuildConfigurationCollection.Transitions.getDynamicTransition.
This is a legacy dependency on the configuration transition table, which is
only needed for static configurations. Dynamic configurations didn't actually
use anything in that table: this was just a convenience interface that could
have equally been defined somewhere else. So this cl defines it somewhere else.
There's still one last dependency: Transitions.configurationHook. We'll tackle
that in a followup cl.
PiperOrigin-RevId: 161141650
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 5 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java | 3 |
2 files changed, 4 insertions, 4 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 d8e079ea11..81db738b73 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 @@ -1494,9 +1494,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { } else if (!fromConfig.useDynamicConfigurations()) { return fromConfig.getConfiguration(transition); } else { - PatchTransition patchTransition = (transition instanceof PatchTransition) - ? (PatchTransition) transition - : (PatchTransition) fromConfig.getTransitions().getDynamicTransition(transition); + PatchTransition patchTransition = + (PatchTransition) ruleClassProvider.getDynamicTransitionMapper().map(transition); return skyframeExecutor.getConfigurationForTesting(reporter, fromConfig.fragmentClasses(), patchTransition.apply(fromConfig.getOptions())); } diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java index 9fae49273a..a3b5b7e4e1 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java @@ -608,7 +608,8 @@ public class BuildEventStreamerTest extends FoundationTestCase { BuildConfiguration.Fragment>of(), BuildOptions.of(ImmutableList.<Class<? extends FragmentOptions>>of( BuildConfiguration.Options.class)), - "workspace"); + "workspace", + null); BuildEvent firstWithConfiguration = new GenericConfigurationEvent(testId("first"), configuration); BuildEvent secondWithConfiguration = |