diff options
| author | 2020-02-28 17:22:51 +0000 | |
|---|---|---|
| committer | 2020-02-28 17:22:51 +0000 | |
| commit | 450510faa7ba08ef80f40a6574165d34d68dc089 (patch) | |
| tree | eae4a9645f623bf55a1844b61923f3b6cd3ed6ea /apex/apex_test.go | |
| parent | bf3da2c7588129de099ba8226e8ced2911f4153d (diff) | |
| parent | 6e147e4f54645ca669950f8e29e18ea182e6fa18 (diff) | |
Merge changes I789b526c,Ie15c811f am: 6e147e4f54
Change-Id: I67a97d5d537f986ec3018d7ecaaa94143f48b7ef
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 10fc8d6aa..d1d8d6491 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -1532,13 +1532,17 @@ 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 } } - surplus = append(surplus, file.path) + if !mactchFound { + surplus = append(surplus, file.path) + } } if len(surplus) > 0 { @@ -1605,8 +1609,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", @@ -1666,6 +1672,8 @@ func TestVndkApexWithPrebuilt(t *testing.T) { "lib/libvndk.so", "lib/libvndk.arm.so", "lib64/libvndk.so", + "lib/libc++.so", + "lib64/libc++.so", "etc/*", }) } @@ -1877,6 +1885,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/*", }) } |