summaryrefslogtreecommitdiff
path: root/rust/test_test.go
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2022-04-29 02:04:30 +0900
committer Jooyung Han <jooyung@google.com> 2022-04-28 23:55:43 +0000
commit10bea7d44a96604b7335161065d6c8debfdc67ab (patch)
treef72b50a97a143ed19b02478f4fb2617a4a47ee7b /rust/test_test.go
parentf7fa021b6529cf467cc1bcda60a5a00615f257ca (diff)
Put rust_test.data_libs under lib[64]
Rust test binary depending on native libraries would require them under lib[64] directory so that the test binary can open them with default rpath values. Bug: 204562227 Test: presubmit Change-Id: I029bb32c4c98fba21bd28e579a9df9f184a7f045
Diffstat (limited to 'rust/test_test.go')
-rw-r--r--rust/test_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/rust/test_test.go b/rust/test_test.go
index 112417673..8906f1cb0 100644
--- a/rust/test_test.go
+++ b/rust/test_test.go
@@ -187,12 +187,12 @@ func TestDataLibsRelativeInstallPath(t *testing.T) {
t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath)
}
entries := android.AndroidMkEntriesForTest(t, ctx, module)[0]
- if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:foo/bar/baz") {
- t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:foo/bar/baz`,"+
+ if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:lib64/foo/bar/baz") {
+ t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:lib64/foo/bar/baz`,"+
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][0])
}
- if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][1], ":librust_test_lib.so:foo/bar/baz") {
- t.Errorf("expected LOCAL_TEST_DATA to end with `:librust_test_lib.so:foo/bar/baz`,"+
+ if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][1], ":librust_test_lib.so:lib64/foo/bar/baz") {
+ t.Errorf("expected LOCAL_TEST_DATA to end with `:librust_test_lib.so:lib64/foo/bar/baz`,"+
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][1])
}
if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][2], ":rusty:foo/bar/baz") {