generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am af4d630e: Merge "Added new test for dlopen which is failing for MIPS."

Browse Source 
* commit 'af4d630e4d87dca38cc2026b992bb50c49911db9':
  Added new test for dlopen which is failing for MIPS.
This commit is contained in:
Elliott Hughes 2012-09-13 09:47:51 -07:00 committed by Android Git Automerger
commit 58d15966c8
2 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/Android.mk
View File

@ -23,22 +23,28 @@ test_src_files = \
pthread_test.cpp \ pthread_test.cpp \
regex_test.cpp \ regex_test.cpp \
test_dynamic_ldflags = -Wl,--export-dynamic -Wl,-u,DlSymTestFunction
test_dynamic_src_files = \
dlopen_test.cpp \
# Build for the device (with bionic's .so). Run with: # Build for the device (with bionic's .so). Run with:
# adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests # adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := bionic-unit-tests LOCAL_MODULE := bionic-unit-tests
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := $(test_src_files) LOCAL_LDFLAGS += $(test_dynamic_ldflags)
LOCAL_SHARED_LIBRARIES += libdl
LOCAL_SRC_FILES := $(test_src_files) $(test_dynamic_src_files)
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
# Build for the device (with bionic's .a). Run with: # Build for the device (with bionic's .a). Run with:
# adb shell /data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static # adb shell /data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc
LOCAL_MODULE := bionic-unit-tests-static LOCAL_MODULE := bionic-unit-tests-static
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_SRC_FILES := $(test_src_files) LOCAL_SRC_FILES := $(test_src_files)
LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
# Build for the host (with glibc). # Build for the host (with glibc).
@ -48,8 +54,9 @@ include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := bionic-unit-tests-glibc LOCAL_MODULE := bionic-unit-tests-glibc
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_LDFLAGS += -lpthread LOCAL_LDFLAGS += -lpthread -ldl
LOCAL_SRC_FILES := $(test_src_files) LOCAL_LDFLAGS += $(test_dynamic_ldflags)
LOCAL_SRC_FILES := $(test_src_files) $(test_dynamic_src_files)
include $(BUILD_HOST_NATIVE_TEST) include $(BUILD_HOST_NATIVE_TEST)
endif # !BUILD_TINY_ANDROID endif # !BUILD_TINY_ANDROID

38
tests/dlopen_test.cpp Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <gtest/gtest.h>
#include <dlfcn.h>
static bool gCalled = false;
extern "C" void DlSymTestFunction() {
gCalled = true;
}
TEST(dlopen, dlsym_in_self) {
void* self = dlopen(NULL, RTLD_NOW);
ASSERT_TRUE(self != NULL);
void* sym = dlsym(self, "DlSymTestFunction");
ASSERT_TRUE(sym != NULL);
void (*function)() = reinterpret_cast<void(*)()>(sym);
gCalled = false;
function();
ASSERT_TRUE(gCalled);
}