diff options
Diffstat (limited to 'sh/sh_binary_test.go')
| -rw-r--r-- | sh/sh_binary_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go index 3f2f16f51..650efa5d6 100644 --- a/sh/sh_binary_test.go +++ b/sh/sh_binary_test.go @@ -140,7 +140,8 @@ func TestShTest_dataModules(t *testing.T) { } `) - arches := []string{"android_arm64_armv8-a", "linux_glibc_x86_64"} + buildOS := android.BuildOs.String() + arches := []string{"android_arm64_armv8-a", buildOS + "_x86_64"} for _, arch := range arches { variant := ctx.ModuleForTests("foo", arch) @@ -226,7 +227,7 @@ func TestShTestHost_dataDeviceModules(t *testing.T) { expectedData := []string{ filepath.Join(buildDir, ".intermediates/bar/android_arm64_armv8-a/:bar"), // libbar has been relocated, and so has a variant that matches the host arch. - filepath.Join(buildDir, ".intermediates/foo/linux_glibc_x86_64/relocated/:lib64/libbar.so"), + filepath.Join(buildDir, ".intermediates/foo/"+buildOS+"_x86_64/relocated/:lib64/libbar.so"), } actualData := entries.EntryMap["LOCAL_TEST_DATA"] if !reflect.DeepEqual(expectedData, actualData) { |