From 0c55445b72e80afcc2f028e1c676284935f7784e Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Thu, 11 Jun 2020 20:53:40 +0000 Subject: [PATCH] Revert "Add module name to sh_test install path." This reverts commit 2d4f1a2f7e96e760216e39f36503fee2a8a97d95. Reason for revert: Droidcop: Potential culprit for Bug 158778263 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Bug: 158778263 Change-Id: I5287b3c9331b08925dd22b32c84e4c3b6f71b58a --- sh/sh_binary.go | 7 ++----- sh/sh_binary_test.go | 17 +++++------------ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 37e825309..9276a62e9 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -107,8 +107,6 @@ type ShTest struct { testProperties TestProperties - installDir android.InstallPath - data android.Paths testConfig android.Path } @@ -203,8 +201,8 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { } else if !ctx.Host() && ctx.Config().HasMultilibConflict(ctx.Arch().ArchType) { testDir = filepath.Join(testDir, ctx.Arch().ArchType.String()) } - s.installDir = android.PathForModuleInstall(ctx, testDir, proptools.String(s.properties.Sub_dir), s.Name()) - s.installedFile = ctx.InstallExecutable(s.installDir, s.outputFilePath.Base(), s.outputFilePath) + installDir := android.PathForModuleInstall(ctx, testDir, proptools.String(s.properties.Sub_dir)) + s.installedFile = ctx.InstallExecutable(installDir, s.outputFilePath.Base(), s.outputFilePath) s.data = android.PathsForModuleSrc(ctx, s.testProperties.Data) @@ -232,7 +230,6 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { func(entries *android.AndroidMkEntries) { s.customAndroidMkEntries(entries) - entries.SetPath("LOCAL_MODULE_PATH", s.installDir.ToMakePath()) entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", s.testProperties.Test_suites...) if s.testProperties.Test_config != nil { entries.SetString("LOCAL_TEST_CONFIG", proptools.String(s.testProperties.Test_config)) diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go index 6ab22c5bf..6c0d96abe 100644 --- a/sh/sh_binary_test.go +++ b/sh/sh_binary_test.go @@ -55,7 +55,7 @@ func testShBinary(t *testing.T, bp string) (*android.TestContext, android.Config return ctx, config } -func TestShTest(t *testing.T) { +func TestShTestTestData(t *testing.T) { ctx, config := testShBinary(t, ` sh_test { name: "foo", @@ -71,17 +71,10 @@ func TestShTest(t *testing.T) { mod := ctx.ModuleForTests("foo", "android_arm64_armv8-a").Module().(*ShTest) entries := android.AndroidMkEntriesForTest(t, config, "", mod)[0] - - expectedPath := "/tmp/target/product/test_device/data/nativetest64/foo" - actualPath := entries.EntryMap["LOCAL_MODULE_PATH"][0] - if expectedPath != actualPath { - t.Errorf("Unexpected LOCAL_MODULE_PATH expected: %q, actual: %q", expectedPath, actualPath) - } - - expectedData := []string{":testdata/data1", ":testdata/sub/data2"} - actualData := entries.EntryMap["LOCAL_TEST_DATA"] - if !reflect.DeepEqual(expectedData, actualData) { - t.Errorf("Unexpected test data expected: %q, actual: %q", expectedData, actualData) + expected := []string{":testdata/data1", ":testdata/sub/data2"} + actual := entries.EntryMap["LOCAL_TEST_DATA"] + if !reflect.DeepEqual(expected, actual) { + t.Errorf("Unexpected test data expected: %q, actual: %q", expected, actual) } }