tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't sort the results of TransitionMutator.Split

Browse source 
The ordering of variants can be significant  when adding
inter-variant dependencies, as a variant can only depend on earlier
variants.  Allow maintaining the existing variant ordering when
converting mutators to TransitionMutator by keeping the ordering
of TransitionMutator.Split.  Variations that were requested by
incoming dependencies that are not present in Split are still
sorted, as they have no inherent ordering.

Bug: 319288033
Test: TestPostTransitionDeps
Flag: NONE
Change-Id: I648ef95f08a05f9a64ce97e6a39bae10ce88771a
This commit is contained in:
Colin Cross 2024-05-07 13:49:51 -07:00
parent 5ac6648829
commit c5b3c0ca9e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
transition.go
View file

@ -186,8 +186,11 @@ func (t *transitionMutatorImpl) topDownMutator(mctx TopDownMutatorContext) {
// and modules that directly depend on it. Since this is a top-down mutator, // and modules that directly depend on it. Since this is a top-down mutator,
// all modules that directly depend on this module have already been processed // all modules that directly depend on this module have already been processed
// so no locking is necessary. // so no locking is necessary.
module.transitionVariations = addToStringListIfNotPresent(module.transitionVariations, mutatorSplits...) // Sort the module transitions, but keep the mutatorSplits in the order returned
// by Split, as the order can be significant when inter-variant dependencies are
// used.
sort.Strings(module.transitionVariations) sort.Strings(module.transitionVariations)
module.transitionVariations = addToStringListIfNotPresent(mutatorSplits, module.transitionVariations...)
outgoingTransitionCache := make([][]string, len(module.transitionVariations)) outgoingTransitionCache := make([][]string, len(module.transitionVariations))
for srcVariationIndex, srcVariation := range module.transitionVariations { for srcVariationIndex, srcVariation := range module.transitionVariations {

6
transition_test.go
View file

@ -60,7 +60,7 @@ const testTransitionBp = `
transition_module { transition_module {
name: "A", name: "A",
deps: ["B", "C"], deps: ["B", "C"],
split: ["a", "b"], split: ["b", "a"],
} }
transition_module { transition_module {
@ -132,7 +132,7 @@ func TestTransition(t *testing.T) {
assertNoErrors(t, errs) assertNoErrors(t, errs)
// Module A uses Split to create a and b variants // Module A uses Split to create a and b variants
checkTransitionVariants(t, ctx, "A", []string{"a", "b"}) checkTransitionVariants(t, ctx, "A", []string{"b", "a"})
// Module B inherits a and b variants from A // Module B inherits a and b variants from A
checkTransitionVariants(t, ctx, "B", []string{"", "a", "b"}) checkTransitionVariants(t, ctx, "B", []string{"", "a", "b"})
// Module C inherits a and b variants from A, but gets an outgoing c variant from B // Module C inherits a and b variants from A, but gets an outgoing c variant from B
@ -184,7 +184,7 @@ func TestPostTransitionDeps(t *testing.T) {
assertNoErrors(t, errs) assertNoErrors(t, errs)
// Module A uses Split to create a and b variants // Module A uses Split to create a and b variants
checkTransitionVariants(t, ctx, "A", []string{"a", "b"}) checkTransitionVariants(t, ctx, "A", []string{"b", "a"})
// Module B inherits a and b variants from A // Module B inherits a and b variants from A
checkTransitionVariants(t, ctx, "B", []string{"", "a", "b"}) checkTransitionVariants(t, ctx, "B", []string{"", "a", "b"})
// Module C inherits a and b variants from A, but gets an outgoing c variant from B // Module C inherits a and b variants from A, but gets an outgoing c variant from B