diff options
Diffstat (limited to 'sh/sh_binary_test.go')
| -rw-r--r-- | sh/sh_binary_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go index 5fcb58d20..37450b0e2 100644 --- a/sh/sh_binary_test.go +++ b/sh/sh_binary_test.go @@ -135,7 +135,7 @@ func TestShTest_dataModules(t *testing.T) { if arch == "darwin_x86_64" { libExt = ".dylib" } - relocated := variant.Output("relocated/lib64/libbar" + libExt) + relocated := variant.Output(filepath.Join("out/soong/.intermediates/foo", arch, "relocated/lib64/libbar"+libExt)) expectedInput := "out/soong/.intermediates/libbar/" + arch + "_shared/libbar" + libExt android.AssertPathRelativeToTopEquals(t, "relocation input", expectedInput, relocated.Input) @@ -204,18 +204,19 @@ func TestShTestHost_dataDeviceModules(t *testing.T) { `) buildOS := config.BuildOS.String() - variant := ctx.ModuleForTests("foo", buildOS+"_x86_64") + variant := buildOS + "_x86_64" + foo := ctx.ModuleForTests("foo", variant) - relocated := variant.Output("relocated/lib64/libbar.so") + relocated := foo.Output(filepath.Join("out/soong/.intermediates/foo", variant, "relocated/lib64/libbar.so")) expectedInput := "out/soong/.intermediates/libbar/android_arm64_armv8-a_shared/libbar.so" android.AssertPathRelativeToTopEquals(t, "relocation input", expectedInput, relocated.Input) - mod := variant.Module().(*ShTest) + mod := foo.Module().(*ShTest) entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0] expectedData := []string{ "out/soong/.intermediates/bar/android_arm64_armv8-a/:bar", // libbar has been relocated, and so has a variant that matches the host arch. - "out/soong/.intermediates/foo/" + buildOS + "_x86_64/relocated/:lib64/libbar.so", + "out/soong/.intermediates/foo/" + variant + "/relocated/:lib64/libbar.so", } actualData := entries.EntryMap["LOCAL_TEST_DATA"] android.AssertStringPathsRelativeToTopEquals(t, "LOCAL_TEST_DATA", config, expectedData, actualData) |