diff options
| author | Ivan Lozano <ivanlozano@google.com> | 2020-02-06 12:05:10 -0500 |
|---|---|---|
| committer | Ivan Lozano <ivanlozano@google.com> | 2020-02-06 13:38:50 -0500 |
| commit | d648c43fec771bffaa888734c2a9894ac31ae43f (patch) | |
| tree | e9f30a797f80139410c42e30ebb78b675b7ce99f /rust/rust_test.go | |
| parent | 026ffecb9d1255325d074b9bd15d25d36395a2c3 (diff) | |
Fix lib name resolution if extension is substring.
If a library happens to contain the extension as a substring in its
name, libNameFromFilePath will return a truncated library name. Change
this calculation to remove the last instance of the extension substring
instead.
Bug: 147140513
Test: Modified rust tests pass.
Change-Id: I0ed91e5f571ed5c4040ee15956a1598846aee43a
Diffstat (limited to 'rust/rust_test.go')
| -rw-r--r-- | rust/rust_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rust/rust_test.go b/rust/rust_test.go index 3be9ee7b9..afe530abf 100644 --- a/rust/rust_test.go +++ b/rust/rust_test.go @@ -114,13 +114,13 @@ func testRustError(t *testing.T, pattern string, bp string) { // Test that we can extract the lib name from a lib path. func TestLibNameFromFilePath(t *testing.T) { - libBarPath := android.PathForTesting("out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/libbar.so") + libBarPath := android.PathForTesting("out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/libbar.so.so") libLibPath := android.PathForTesting("out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/liblib.dylib.so") libBarName := libNameFromFilePath(libBarPath) libLibName := libNameFromFilePath(libLibPath) - expectedResult := "bar" + expectedResult := "bar.so" if libBarName != expectedResult { t.Errorf("libNameFromFilePath returned the wrong name; expected '%#v', got '%#v'", expectedResult, libBarName) } |