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

am f602bf8e: Merge "Fix the glibc tests again."

Browse Source 
* commit 'f602bf8e943d76a03d0739d79d831e640ed07df7':
  Fix the glibc tests again.
This commit is contained in:
Elliott Hughes 2014-04-23 02:32:43 +00:00 committed by Android Git Automerger
commit c6463dc124
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/Android.mk
View File

@ -254,14 +254,6 @@ include $(LOCAL_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
ifeq ($(TARGET_ARCH),x86)
LINKER = linker
NATIVE_TEST_SUFFIX=32
else
LINKER = linker64
NATIVE_TEST_SUFFIX=64
endif
bionic-unit-tests-glibc_whole_static_libraries := \ bionic-unit-tests-glibc_whole_static_libraries := \
libBionicStandardTests \ libBionicStandardTests \
@ -275,6 +267,14 @@ build_type := host
build_target := NATIVE_TEST build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk include $(LOCAL_PATH)/Android.build.mk
ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm mips x86))
LINKER = linker64
NATIVE_TEST_SUFFIX=64
else
LINKER = linker
NATIVE_TEST_SUFFIX=32
endif
# gtest needs ANDROID_DATA/local/tmp for death test output. # gtest needs ANDROID_DATA/local/tmp for death test output.
# Make sure to create ANDROID_DATA/local/tmp if doesn't exist. # Make sure to create ANDROID_DATA/local/tmp if doesn't exist.
# Use the current target out directory as ANDROID_DATA. # Use the current target out directory as ANDROID_DATA.
@ -289,6 +289,7 @@ bionic-unit-tests-glibc-run: bionic-unit-tests-glibc
# Run the unit tests built against x86 bionic on an x86 host. # Run the unit tests built against x86 bionic on an x86 host.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
# gtest needs ANDROID_DATA/local/tmp for death test output. # gtest needs ANDROID_DATA/local/tmp for death test output.
# Make sure to create ANDROID_DATA/local/tmp if doesn't exist. # Make sure to create ANDROID_DATA/local/tmp if doesn't exist.
# bionic itself should always work relative to ANDROID_DATA or ANDROID_ROOT. # bionic itself should always work relative to ANDROID_DATA or ANDROID_ROOT.
@ -306,6 +307,7 @@ bionic-unit-tests-run-on-host: bionic-unit-tests $(TARGET_OUT_EXECUTABLES)/$(LIN
LD_LIBRARY_PATH=$(TARGET_OUT_SHARED_LIBRARIES) \ LD_LIBRARY_PATH=$(TARGET_OUT_SHARED_LIBRARIES) \
$(TARGET_OUT_DATA_NATIVE_TESTS)/bionic-unit-tests/bionic-unit-tests$(NATIVE_TEST_SUFFIX) $(BIONIC_TEST_FLAGS) $(TARGET_OUT_DATA_NATIVE_TESTS)/bionic-unit-tests/bionic-unit-tests$(NATIVE_TEST_SUFFIX) $(BIONIC_TEST_FLAGS)
endif endif
endif
endif # linux-x86
endif # !BUILD_TINY_ANDROID endif # !BUILD_TINY_ANDROID