diff options
| author | Elliott Hughes <enh@google.com> | 2023-04-20 15:50:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-20 15:50:55 +0000 |
| commit | 6607207d5cdcf51de120d8fb88994e5ad1f00483 (patch) | |
| tree | 26f21a74effb87d157a1557d9d396ade2df837fa | |
| parent | bee044207b1fa700f134bae05d097b74ab645ccb (diff) | |
| parent | e393d48bc73e3de9eff3cdb234909de33f318634 (diff) | |
| download | bionic-6607207d5cdcf51de120d8fb88994e5ad1f00483.tar.gz | |
Merge "Clarify dlfcn.dladdr_libc slightly." am: e393d48bc7
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2548970
Change-Id: I173203d54609540c1016f477f5aa47f295190a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/dlfcn_test.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp index 0c71b2ab7..b68ee7b51 100644 --- a/tests/dlfcn_test.cpp +++ b/tests/dlfcn_test.cpp @@ -987,24 +987,25 @@ TEST(dlfcn, dladdr_libc) { #endif Dl_info info; - void* addr = reinterpret_cast<void*>(puts); // well-known libc function + void* addr = reinterpret_cast<void*>(puts); // An arbitrary libc function. ASSERT_TRUE(dladdr(addr, &info) != 0); - char libc_realpath[PATH_MAX]; - // Check if libc is in canonical path or in alternate path. + const char* expected_path; if (strncmp(ALTERNATE_PATH_TO_SYSTEM_LIB, info.dli_fname, sizeof(ALTERNATE_PATH_TO_SYSTEM_LIB) - 1) == 0) { // Platform with emulated architecture. Symlink on ARC++. - ASSERT_TRUE(realpath(ALTERNATE_PATH_TO_LIBC, libc_realpath) == libc_realpath); + expected_path = ALTERNATE_PATH_TO_LIBC; } else if (strncmp(PATH_TO_BOOTSTRAP_LIBC, info.dli_fname, sizeof(PATH_TO_BOOTSTRAP_LIBC) - 1) == 0) { - ASSERT_TRUE(realpath(PATH_TO_BOOTSTRAP_LIBC, libc_realpath) == libc_realpath); + expected_path = PATH_TO_BOOTSTRAP_LIBC; } else { // /system/lib is symlink when this test is executed on host. - ASSERT_TRUE(realpath(PATH_TO_LIBC, libc_realpath) == libc_realpath); + expected_path = PATH_TO_LIBC; } + char libc_realpath[PATH_MAX]; + ASSERT_TRUE(realpath(expected_path, libc_realpath) != nullptr) << strerror(errno); ASSERT_STREQ(libc_realpath, info.dli_fname); // TODO: add check for dfi_fbase |