am 88923ba4: am 0b10ffb4: Merge "Fix dlsym_failure NULL handle test"

* commit '88923ba4d8bbb4b47cde66bd66d2690d3cfb5d80':
  Fix dlsym_failure NULL handle test
This commit is contained in:
Dmitriy Ivanov 2014-05-22 17:18:44 +00:00 committed by Android Git Automerger
commit 587afa2efc

View File

@ -101,17 +101,13 @@ TEST(dlfcn, dlsym_failures) {
void* sym; void* sym;
// lp64 RTLD_DEFAULT=(void*)0 #if defined(__BIONIC__) && !defined(__LP64__)
#if !defined(__LP64__) // RTLD_DEFAULT in lp32 bionic is not (void*)0
// NULL handle. // so it can be distinguished from the NULL handle.
sym = dlsym(NULL, "test"); sym = dlsym(NULL, "test");
ASSERT_TRUE(sym == NULL); ASSERT_TRUE(sym == NULL);
#if defined(__BIONIC__)
ASSERT_SUBSTR("dlsym library handle is null", dlerror()); ASSERT_SUBSTR("dlsym library handle is null", dlerror());
#else
ASSERT_SUBSTR("undefined symbol: test", dlerror()); // glibc isn't specific about the failure.
#endif #endif
#endif // !defined(__LP64__)
// NULL symbol name. // NULL symbol name.
#if defined(__BIONIC__) #if defined(__BIONIC__)