From: David 'Digit' Turner <digit@google.com>
Date: Sun, 2 Jan 2011 09:05:21 +0000 (+0100)
Subject: tests:bionic: small improvement to dlclose test.
X-Git-Tag: android-x86-4.4-r1~238
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f101d6dd0e9da88ffed3aef0686758950285b3d;p=android-x86%2Fsystem-extras.git

tests:bionic: small improvement to dlclose test.

Change-Id: I2fa0e06fab770a42b95006751baca07bb0e19d1e
---

diff --git a/tests/bionic/libc/bionic/test_dlclose_destruction.c b/tests/bionic/libc/bionic/test_dlclose_destruction.c
index 928057a1..348df17e 100644
--- a/tests/bionic/libc/bionic/test_dlclose_destruction.c
+++ b/tests/bionic/libc/bionic/test_dlclose_destruction.c
@@ -76,6 +76,10 @@ check_library(const char*  libname)
     }
 
     fprintf(stderr, "%s unloaded.\n", libname);
+    if (y != 2) {
+        fprintf(stderr, "Static destructors was not called on dlclose()!\n");
+        return 2;
+    }
     return 0;
 }
 
diff --git a/tests/bionic/libc/run-test.sh b/tests/bionic/libc/run-test.sh
index bd9b25ed..c88c6fe0 100755
--- a/tests/bionic/libc/run-test.sh
+++ b/tests/bionic/libc/run-test.sh
@@ -165,7 +165,7 @@ set_adb_cmd_log $TMPDIR/adb.log.txt
 
 DEVICE_TEST_DIR=/data/local/bionic-test
 DEVICE_TEST=$DEVICE_TEST_DIR/$TESTNAME
-adb_cmd mkdir -p $DEVICE_TEST_DIR
+adb_cmd mkdir $DEVICE_TEST_DIR
 $ADB_CMD push $TESTEXE $DEVICE_TEST_DIR/
 if [ $? != 0 ] ; then
     echo "ERROR: Can't push test to device!"