commit 831405b749d15a11fb947a40d61fd858e952d860
author Dmitriy Ivanov <dimitry@google.com> Sat May 31 01:28:32 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 31 01:28:33 2014 +0000
tree c4125c044f47c85791810278c8fd6eca14488386
parent 66b5e6b609f16062262b777905bdd2305a941596
parent 214e64135ee22e8aa7f71e56e0f5662dc6746ad0

Merge "Make atexit.dlclose work for glibc"

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index b75964a..db8dd8c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -312,8 +312,10 @@
     atexit_testlib.cpp
 
 module := libtest_atexit
-build_type := target
 build_target := SHARED_LIBRARY
+build_type := target
+include $(LOCAL_PATH)/Android.build.mk
+build_type := host
 include $(LOCAL_PATH)/Android.build.mk
 
 # -----------------------------------------------------------------------------

tests/atexit_test.cpp

diff --git a/tests/atexit_test.cpp b/tests/atexit_test.cpp
index 797231f..e01220e 100644
--- a/tests/atexit_test.cpp
+++ b/tests/atexit_test.cpp
@@ -25,7 +25,6 @@
 #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);
@@ -39,9 +38,6 @@
   // 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 {

tests/atexit_testlib.cpp

diff --git a/tests/atexit_testlib.cpp b/tests/atexit_testlib.cpp
index 1fefdf0..d35f57b 100644
--- a/tests/atexit_testlib.cpp
+++ b/tests/atexit_testlib.cpp
@@ -71,6 +71,5 @@
   atexit_valid_this_in_static_dtor = valid_this_in_static_dtor;
   atexit(atexit_handler_regular);
   atexit(atexit_handler_with_atexit);
-  atexit(NULL);
 }