StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add UpsideDownCake to the releases for which snapshots can be built

Browse Source 
Bug: 249769908
Test: packages/modules/common/mainline_modules_sdks.sh
      # With modification to add UpsideDownCake to list of releases
      # to build with.
Change-Id: I050811e7d9a5d0a8cf54a42c03ad889defa3a251
This commit is contained in:
Paul Duffin
2022-09-29 17:37:49 +01:00
parent b5a04d7905
commit 03d2cef47b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/build_release.go
View File

@@ -100,6 +100,7 @@ var (
// Add the dessert build releases from oldest to newest. // Add the dessert build releases from oldest to newest.
buildReleaseS = initBuildRelease("S") buildReleaseS = initBuildRelease("S")
buildReleaseT = initBuildRelease("Tiramisu") buildReleaseT = initBuildRelease("Tiramisu")
buildReleaseU = initBuildRelease("UpsideDownCake")
// Add the current build release which is always treated as being more recent than any other // Add the current build release which is always treated as being more recent than any other
// build release, including those added in tests. // build release, including those added in tests.

4
sdk/build_release_test.go
View File

@@ -42,7 +42,7 @@ func TestNameToRelease(t *testing.T) {
android.AssertDeepEquals(t, "release", (*buildRelease)(nil), release) android.AssertDeepEquals(t, "release", (*buildRelease)(nil), release)
// Uses a wildcard in the error message to allow for additional build releases to be added to // Uses a wildcard in the error message to allow for additional build releases to be added to
// the supported set without breaking this test. // the supported set without breaking this test.
android.FailIfNoMatchingErrors(t, `unknown release "A", expected one of \[S,Tiramisu,F1,F2,current\]`, []error{err}) android.FailIfNoMatchingErrors(t, `unknown release "A", expected one of \[S,Tiramisu,UpsideDownCake,F1,F2,current\]`, []error{err})
}) })
} }
@@ -60,7 +60,7 @@ func TestParseBuildReleaseSet(t *testing.T) {
t.Run("closed range", func(t *testing.T) { t.Run("closed range", func(t *testing.T) {
set, err := parseBuildReleaseSet("S-F1") set, err := parseBuildReleaseSet("S-F1")
android.AssertDeepEquals(t, "errors", nil, err) android.AssertDeepEquals(t, "errors", nil, err)
android.AssertStringEquals(t, "set", "[S,Tiramisu,F1]", set.String()) android.AssertStringEquals(t, "set", "[S,Tiramisu,UpsideDownCake,F1]", set.String())
}) })
invalidAReleaseMessage := `unknown release "A", expected one of ` + allBuildReleaseSet.String() invalidAReleaseMessage := `unknown release "A", expected one of ` + allBuildReleaseSet.String()
t.Run("invalid release", func(t *testing.T) { t.Run("invalid release", func(t *testing.T) {