am 66b5e6b6: Merge "Do not run dlclose test on glibc."

* commit '66b5e6b609f16062262b777905bdd2305a941596':
  Do not run dlclose test on glibc.
This commit is contained in:
Christopher Ferris 2014-05-31 00:43:52 +00:00 committed by Android Git Automerger
commit bd1ec44cc5

View File

@ -25,6 +25,7 @@
#include <string>
TEST(atexit, dlclose) {
#if defined(__BIONIC__)
std::string atexit_call_sequence;
bool valid_this_in_static_dtor = false;
void* handle = dlopen("libtest_atexit.so", RTLD_NOW);
@ -38,6 +39,9 @@ TEST(atexit, dlclose) {
// this test verifies atexit call from atexit handler. as well as the order of calls
ASSERT_EQ("Humpty Dumpty sat on a wall", atexit_call_sequence);
ASSERT_TRUE(valid_this_in_static_dtor);
#else // __BIONIC__
GTEST_LOG_(INFO) << "This test does nothing.";
#endif // __BIONIC__
}
class TestMainStaticDtorClass {