Merge "Revert "Add module name to sh_test install path.""

1 files changed, 5 insertions, 12 deletions

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)
 	}
 }