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

am 305be18d: Merge "Allow make to set a timeout for the host tests."

Browse Source 
* commit '305be18d10254df4a9444f8505f569e94718f488':
  Allow make to set a timeout for the host tests.
This commit is contained in:
Dan Albert 2015-01-24 00:07:20 +00:00 committed by Android Git Automerger
commit e6ad16304d
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
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-unit-tests-run-on-host32: bionic-unit-tests bionic-prepare-run-on-host
ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_DNS_MODE=local \
ANDROID_ROOT=$(TARGET_OUT) \
timeout $(TEST_TIMEOUT) \
$(TARGET_OUT_DATA)/nativetest/bionic-unit-tests/bionic-unit-tests32 $(BIONIC_TEST_FLAGS)
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_DNS_MODE=local \
ANDROID_ROOT=$(TARGET_OUT) \
timeout $(TEST_TIMEOUT) \
$(TARGET_OUT_DATA)/nativetest64/bionic-unit-tests/bionic-unit-tests64 $(BIONIC_TEST_FLAGS)
endif