Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d8906c6 authored by Jooyung Han's avatar Jooyung Han
Browse files

apex: fix a test util (ensureExactContents) 

ensureExactContents shouldn't return immediately when it finds a match
from expected list of files.

Bug: 151491839
Test: m nothing
Merged-In: Ie15c811f9cfcae7ede28dee0fcf203cee24659a0
Change-Id: Ie15c811f9cfcae7ede28dee0fcf203cee24659a0
(cherry picked from commit e6436d7b)
parent 9d790c78

apex/apex_test.go

+12 −2
Original line number Diff line number Diff line
@@ -1828,14 +1828,18 @@ func ensureExactContents(t *testing.T, ctx *android.TestContext, moduleName, var 
	var surplus []string

	filesMatched := make(map[string]bool)

	for _, file := range getFiles(t, ctx, moduleName, variant) {

		mactchFound := false

		for _, expected := range files {

			if matched, _ := path.Match(expected, file.path); matched {

				filesMatched[expected] = true

				return

				mactchFound = true

				break

			}

		}

		if !mactchFound {

			surplus = append(surplus, file.path)

		}

	}



	if len(surplus) > 0 {

		sort.Strings(surplus)
@@ -1901,8 +1905,10 @@ func TestVndkApexCurrent(t *testing.T) { 
	ensureExactContents(t, ctx, "myapex", "android_common_image", []string{

		"lib/libvndk.so",

		"lib/libvndksp.so",

		"lib/libc++.so",

		"lib64/libvndk.so",

		"lib64/libvndksp.so",

		"lib64/libc++.so",

		"etc/llndk.libraries.VER.txt",

		"etc/vndkcore.libraries.VER.txt",

		"etc/vndksp.libraries.VER.txt",
@@ -1962,6 +1968,8 @@ func TestVndkApexWithPrebuilt(t *testing.T) { 
		"lib/libvndk.so",

		"lib/libvndk.arm.so",

		"lib64/libvndk.so",

		"lib/libc++.so",

		"lib64/libc++.so",

		"etc/*",

	})

}
@@ -2173,6 +2181,8 @@ func TestVndkApexSkipsNativeBridgeSupportedModules(t *testing.T) { 
	ensureExactContents(t, ctx, "myapex", "android_common_image", []string{

		"lib/libvndk.so",

		"lib64/libvndk.so",

		"lib/libc++.so",

		"lib64/libc++.so",

		"etc/*",

	})

}