tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow make to set a timeout for the host tests.

Browse source 
Change-Id: Icc2ebf64bd1da1687bf313fe7a5640155c5795d8
This commit is contained in:
Dan Albert 2015-01-23 11:35:48 -08:00
parent 7f3d65de8c
commit 4ce907d2ce
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/Android.mk
View file

@ -413,11 +413,15 @@ bionic-unit-tests-glibc-run: bionic-unit-tests-glibc
include $(LOCAL_PATH)/../build/run-on-host.mk include $(LOCAL_PATH)/../build/run-on-host.mk
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
TEST_TIMEOUT := 0
# BIONIC_TEST_FLAGS is either empty or it comes from the user. # BIONIC_TEST_FLAGS is either empty or it comes from the user.
bionic-unit-tests-run-on-host32: bionic-unit-tests bionic-prepare-run-on-host bionic-unit-tests-run-on-host32: bionic-unit-tests bionic-prepare-run-on-host
ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_DNS_MODE=local \ ANDROID_DNS_MODE=local \
ANDROID_ROOT=$(TARGET_OUT) \ ANDROID_ROOT=$(TARGET_OUT) \
timeout $(TEST_TIMEOUT) \
$(TARGET_OUT_DATA)/nativetest/bionic-unit-tests/bionic-unit-tests32 $(BIONIC_TEST_FLAGS) $(TARGET_OUT_DATA)/nativetest/bionic-unit-tests/bionic-unit-tests32 $(BIONIC_TEST_FLAGS)
ifeq ($(TARGET_IS_64_BIT),true) ifeq ($(TARGET_IS_64_BIT),true)
@ -426,6 +430,7 @@ bionic-unit-tests-run-on-host64: bionic-unit-tests bionic-prepare-run-on-host
ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_DNS_MODE=local \ ANDROID_DNS_MODE=local \
ANDROID_ROOT=$(TARGET_OUT) \ ANDROID_ROOT=$(TARGET_OUT) \
timeout $(TEST_TIMEOUT) \
$(TARGET_OUT_DATA)/nativetest64/bionic-unit-tests/bionic-unit-tests64 $(BIONIC_TEST_FLAGS) $(TARGET_OUT_DATA)/nativetest64/bionic-unit-tests/bionic-unit-tests64 $(BIONIC_TEST_FLAGS)
endif endif