tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Clarify dlfcn.dladdr_libc slightly." am: e393d48bc7 am: 6607207d5c am: 7ced97ace7

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2548970

Change-Id: I28769dcf2fe5a351fbcb0483fcff1fce16549432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-04-20 17:25:59 +00:00 committed by Automerger Merge Worker
commit 85bcb38b12
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/dlfcn_test.cpp
View file

@ -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