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

Merge "Prune test preparers in apex/boot_image_test.go" am: 0839101430 am: 9d0d498922

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652447

Change-Id: I6ff973379f4b5205374ef2b22df9d6270d5132f1
This commit is contained in:
Paul Duffin 2021-03-29 10:03:23 +00:00 committed by Automerger Merge Worker
commit 74d71d7848
2 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apex/apex_test.go
View file

@ -140,13 +140,13 @@ var apexFixtureFactory = android.NewFixtureFactory(
],
}
`),
prepareForTestWithMyapex,
android.FixtureMergeMockFs(android.MockFS{
"a.java": nil,
"PrebuiltAppFoo.apk": nil,
"PrebuiltAppFooPriv.apk": nil,
"apex_manifest.json": nil,
"AndroidManifest.xml": nil,
"system/sepolicy/apex/myapex-file_contexts": nil,
"a.java": nil,
"PrebuiltAppFoo.apk": nil,
"PrebuiltAppFooPriv.apk": nil,
"apex_manifest.json": nil,
"AndroidManifest.xml": nil,
"system/sepolicy/apex/myapex.updatable-file_contexts": nil,
"system/sepolicy/apex/myapex2-file_contexts": nil,
"system/sepolicy/apex/otherapex-file_contexts": nil,
@ -204,6 +204,10 @@ var apexFixtureFactory = android.NewFixtureFactory(
}),
)
var prepareForTestWithMyapex = android.FixtureMergeMockFs(android.MockFS{
"system/sepolicy/apex/myapex-file_contexts": nil,
})
func setUp() {
var err error
buildDir, err = ioutil.TempDir("", "soong_apex_test")

31
apex/boot_image_test.go
View file

@ -26,23 +26,32 @@ import (
// Contains tests for boot_image logic from java/boot_image.go as the ART boot image requires
// modules from the ART apex.
var prepareForTestWithBootImage = android.GroupFixturePreparers(
java.PrepareForTestWithDexpreopt,
PrepareForTestWithApexBuildComponents,
)
// Some additional files needed for the art apex.
var prepareForTestWithArtApex = android.FixtureMergeMockFs(android.MockFS{
"com.android.art.avbpubkey": nil,
"com.android.art.pem": nil,
"system/sepolicy/apex/com.android.art-file_contexts": nil,
})
func TestBootImages(t *testing.T) {
result := apexFixtureFactory.Extend(
result := android.GroupFixturePreparers(
prepareForTestWithBootImage,
// Configure some libraries in the art and framework boot images.
dexpreopt.FixtureSetArtBootJars("com.android.art:baz", "com.android.art:quuz"),
dexpreopt.FixtureSetBootJars("platform:foo", "platform:bar"),
filesForSdkLibrary.AddToFixture(),
// Some additional files needed for the art apex.
android.FixtureMergeMockFs(android.MockFS{
"com.android.art.avbpubkey": nil,
"com.android.art.pem": nil,
"system/sepolicy/apex/com.android.art-file_contexts": nil,
}),
prepareForTestWithArtApex,
java.PrepareForTestWithJavaSdkLibraryFiles,
java.FixtureWithLastReleaseApis("foo"),
).RunTestWithBp(t, `
java_sdk_library {
name: "foo",
srcs: ["b.java"],
unsafe_ignore_missing_latest_api: true,
}
java_library {
@ -152,7 +161,9 @@ func checkBootImage(t *testing.T, result *android.TestResult, moduleName string,
}
func TestBootImageInApex(t *testing.T) {
result := apexFixtureFactory.Extend(
result := android.GroupFixturePreparers(
prepareForTestWithBootImage,
prepareForTestWithMyapex,
// Configure some libraries in the framework boot image.
dexpreopt.FixtureSetBootJars("platform:foo", "platform:bar"),
).RunTestWithBp(t, `