commit 5006d8d4f74b84c8b3024ccbf9f84403a1f493ef
author Ulya Trafimovich <skvadrik@google.com> Wed May 20 13:47:13 2020 +0100
committer Ulyana Trafimovich <skvadrik@google.com> Thu May 21 09:39:24 2020 +0000
tree 4086cd1f5d10e2cef4667765a2871b1af6ffbd82
parent 7bdb5e5aaa41d83c86416609f2debba78e47a0b7

Fix TestDexpreoptBootZip on non-Linux hosts.

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

java/dexpreopt_bootjars_test.go

diff --git a/java/dexpreopt_bootjars_test.go b/java/dexpreopt_bootjars_test.go
index feee91a..e9704dc 100644
--- a/java/dexpreopt_bootjars_test.go
+++ b/java/dexpreopt_bootjars_test.go
@@ -116,43 +116,15 @@
 func TestDexpreoptBootZip(t *testing.T) {
 	ruleFile := "boot.zip"
 
-	expectedInputs := []string{
-		"dex_bootjars/android/system/framework/arm/boot-foo.art",
-		"dex_bootjars/android/system/framework/arm/boot-bar.art",
-		"dex_bootjars/android/system/framework/arm/boot-baz.art",
-		"dex_bootjars/android/system/framework/arm/boot-foo.oat",
-		"dex_bootjars/android/system/framework/arm/boot-bar.oat",
-		"dex_bootjars/android/system/framework/arm/boot-baz.oat",
-		"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",
+	ctx := android.PathContextForTesting(testConfig(nil, "", nil))
+	expectedInputs := []string{}
+	for _, target := range dexpreoptTargets(ctx) {
+		for _, ext := range []string{".art", ".oat", ".vdex"} {
+			for _, jar := range []string{"foo", "bar", "baz"} {
+				expectedInputs = append(expectedInputs,
+					filepath.Join("dex_bootjars", target.Os.String(), "system/framework", target.Arch.ArchType.String(), "boot-"+jar+ext))
+			}
+		}
 	}
 
 	expectedOutputs := []string{