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

am 1dd65cc3: am c83837ec: Merge "Make the netdb unit tests work on the host."

Browse Source 
* commit '1dd65cc30c43921f9a0fc604597701b349e3e028':
  Make the netdb unit tests work on the host.
This commit is contained in:
Elliott Hughes
2014-10-29 17:13:30 +00:00
committed by Android Git Automerger
parent 49220899f2 1dd65cc30c
commit 2a45d8cd4f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Android.mk
View File

@@ -404,7 +404,9 @@ bionic-unit-tests-run-on-host: bionic-unit-tests $(TARGET_OUT_EXECUTABLES)/$(LIN
mkdir -p $(TARGET_OUT_DATA)/local/tmp mkdir -p $(TARGET_OUT_DATA)/local/tmp
ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/$(LINKER)` /system/bin ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/$(LINKER)` /system/bin
ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/sh` /system/bin ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/sh` /system/bin
ln -fs `realpath $(TARGET_OUT)/etc` /system/
ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_DNS_MODE=local \
ANDROID_ROOT=$(TARGET_OUT) \ ANDROID_ROOT=$(TARGET_OUT) \
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)
@@ -420,7 +422,9 @@ bionic-unit-tests-run-on-host32: bionic-unit-tests_32 $(TARGET_OUT_EXECUTABLES)/
mkdir -p $(TARGET_OUT_DATA)/local/tmp mkdir -p $(TARGET_OUT_DATA)/local/tmp
ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/linker` /system/bin ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/linker` /system/bin
ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/sh` /system/bin ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/sh` /system/bin
ln -fs `realpath $(TARGET_OUT)/etc` /system/
ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_DNS_MODE=local \
ANDROID_ROOT=$(TARGET_OUT) \ ANDROID_ROOT=$(TARGET_OUT) \
LD_LIBRARY_PATH=$(2ND_TARGET_OUT_SHARED_LIBRARIES) \ LD_LIBRARY_PATH=$(2ND_TARGET_OUT_SHARED_LIBRARIES) \
$(2ND_TARGET_OUT_DATA_NATIVE_TESTS)/bionic-unit-tests/bionic-unit-tests32 $(BIONIC_TEST_FLAGS) $(2ND_TARGET_OUT_DATA_NATIVE_TESTS)/bionic-unit-tests/bionic-unit-tests32 $(BIONIC_TEST_FLAGS)