Merge "Revert "Add module name to sh_test install path."" (fe25dc9f) · Commits · e / os / android_build_soong

sh/sh_binary.go

+2 −5

Original line number	Diff line number	Diff line
		@@ -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.testConfig != nil {
		entries.SetPath("LOCAL_FULL_TEST_CONFIG", s.testConfig)

+5 −12

Original line number	Diff line number	Diff line
		@@ -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)
		}
		}