summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2011-01-02 10:05:21 +0100
committerDavid 'Digit' Turner <digit@google.com>2011-01-31 10:40:44 +0100
commit7f101d6dd0e9da88ffed3aef0686758950285b3d (patch)
tree7868b821a33ba8119ebc38a2c51db1f661c63db1
parent77569c30417f9f8af0e0f5e6b2577bf7aaa8ccb4 (diff)
downloadextras-7f101d6dd0e9da88ffed3aef0686758950285b3d.tar.gz
tests:bionic: small improvement to dlclose test.
Change-Id: I2fa0e06fab770a42b95006751baca07bb0e19d1e
-rw-r--r--tests/bionic/libc/bionic/test_dlclose_destruction.c4
-rwxr-xr-xtests/bionic/libc/run-test.sh2
2 files changed, 5 insertions, 1 deletions
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!"