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

Fix TestDexpreoptBootZip on non-Linux hosts.

Browse Source 
The test was written with the assumption that the build OS is
Linux, which is not always the case (the test was broken on Darwin).

Test: m nothing (on Linux host)
Bug: 157192627
Change-Id: I6ae3deed7a3342f4526528f29ce0a299d24b464b
This commit is contained in:
Ulya Trafimovich
2020-05-20 13:47:13 +01:00
committed by Ulyana Trafimovich
parent 7bdb5e5aaa
commit 5006d8d4f7
1 changed files with 9 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
java/dexpreopt_bootjars_test.go
View File

@@ -116,43 +116,15 @@ func TestDexpreoptBootJars(t *testing.T) {
func TestDexpreoptBootZip(t *testing.T) { func TestDexpreoptBootZip(t *testing.T) {
ruleFile := "boot.zip" ruleFile := "boot.zip"
expectedInputs := []string{ ctx := android.PathContextForTesting(testConfig(nil, "", nil))
"dex_bootjars/android/system/framework/arm/boot-foo.art", expectedInputs := []string{}
"dex_bootjars/android/system/framework/arm/boot-bar.art", for _, target := range dexpreoptTargets(ctx) {
"dex_bootjars/android/system/framework/arm/boot-baz.art", for _, ext := range []string{".art", ".oat", ".vdex"} {
"dex_bootjars/android/system/framework/arm/boot-foo.oat", for _, jar := range []string{"foo", "bar", "baz"} {
"dex_bootjars/android/system/framework/arm/boot-bar.oat", expectedInputs = append(expectedInputs,
"dex_bootjars/android/system/framework/arm/boot-baz.oat", filepath.Join("dex_bootjars", target.Os.String(), "system/framework", target.Arch.ArchType.String(), "boot-"+jar+ext))
"dex_bootjars/android/system/framework/arm/boot-foo.vdex", }
"dex_bootjars/android/system/framework/arm/boot-bar.vdex", }
"dex_bootjars/android/system/framework/arm/boot-baz.vdex",
"dex_bootjars/android/system/framework/arm64/boot-foo.art",
"dex_bootjars/android/system/framework/arm64/boot-bar.art",
"dex_bootjars/android/system/framework/arm64/boot-baz.art",
"dex_bootjars/android/system/framework/arm64/boot-foo.oat",
"dex_bootjars/android/system/framework/arm64/boot-bar.oat",
"dex_bootjars/android/system/framework/arm64/boot-baz.oat",
"dex_bootjars/android/system/framework/arm64/boot-foo.vdex",
"dex_bootjars/android/system/framework/arm64/boot-bar.vdex",
"dex_bootjars/android/system/framework/arm64/boot-baz.vdex",
"dex_bootjars/linux_glibc/system/framework/x86/boot-foo.art",
"dex_bootjars/linux_glibc/system/framework/x86/boot-bar.art",
"dex_bootjars/linux_glibc/system/framework/x86/boot-baz.art",
"dex_bootjars/linux_glibc/system/framework/x86/boot-foo.oat",
"dex_bootjars/linux_glibc/system/framework/x86/boot-bar.oat",
"dex_bootjars/linux_glibc/system/framework/x86/boot-baz.oat",
"dex_bootjars/linux_glibc/system/framework/x86/boot-foo.vdex",
"dex_bootjars/linux_glibc/system/framework/x86/boot-bar.vdex",
"dex_bootjars/linux_glibc/system/framework/x86/boot-baz.vdex",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-foo.art",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-bar.art",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-baz.art",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-foo.oat",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-bar.oat",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-baz.oat",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-foo.vdex",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-bar.vdex",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-baz.vdex",
} }
expectedOutputs := []string{ expectedOutputs := []string{