diff options
| author | 2014-10-24 15:53:15 +0000 | |
|---|---|---|
| committer | 2014-10-24 15:53:16 +0000 | |
| commit | 661cb3f65d3d6fd09f4823f4519890646260fbe6 (patch) | |
| tree | b8408d5617ec04119b213edf03658e5a6607b820 | |
| parent | dc9667e50f6adf99f2d4cfea27b4abcbf42e6a3f (diff) | |
| parent | 41bb331ff93a8e54d0fafaaccfddd791a8ddf430 (diff) | |
Merge "Add more environment variable to control test granularity."
| -rw-r--r-- | build/Android.common_test.mk | 6 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk index 3e76d91aed..ca718f1ed0 100644 --- a/build/Android.common_test.mk +++ b/build/Android.common_test.mk @@ -78,6 +78,9 @@ ART_TEST_JNI_FORCECOPY ?= $(ART_TEST_FULL) # Do you want run-tests with relocation disabled run? ART_TEST_RUN_TEST_NO_RELOCATE ?= $(ART_TEST_FULL) +# Do you want run-tests with prebuilding? +ART_TEST_RUN_TEST_PREBUILD ?= true + # Do you want run-tests with no prebuilding enabled run? ART_TEST_RUN_TEST_NO_PREBUILD ?= $(ART_TEST_FULL) @@ -96,6 +99,9 @@ ART_TEST_RUN_TEST_DEBUG ?= true # Do you want run-tests with libart.so? ART_TEST_RUN_TEST_NDEBUG ?= $(ART_TEST_FULL) +# Do you want run-tests with the host/target's second arch? +ART_TEST_RUN_TEST_2ND_ARCH ?= true + # Do you want failed tests to have their artifacts cleaned up? ART_TEST_RUN_TEST_ALWAYS_CLEAN ?= true diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 5b95beb96e..2de4d5ca73 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -67,7 +67,10 @@ TEST_ART_RUN_TEST_BUILD_RULES := # General rules to build and run a run-test. TARGET_TYPES := host target -PREBUILD_TYPES := prebuild +PREBUILD_TYPES := +ifeq ($(ART_TEST_RUN_TEST_PREBUILD),true) + PREBUILD_TYPES += prebuild +endif ifeq ($(ART_TEST_RUN_TEST_NO_PREBUILD),true) PREBUILD_TYPES += no-prebuild endif @@ -117,8 +120,12 @@ endif ifeq ($(ART_TEST_RUN_TEST_NDEBUG),true) RUN_TYPES += ndebug endif -ADDRESS_SIZES_TARGET := $(ART_PHONY_TEST_TARGET_SUFFIX) $(2ND_ART_PHONY_TEST_TARGET_SUFFIX) -ADDRESS_SIZES_HOST := $(ART_PHONY_TEST_HOST_SUFFIX) $(2ND_ART_PHONY_TEST_HOST_SUFFIX) +ADDRESS_SIZES_TARGET := $(ART_PHONY_TEST_TARGET_SUFFIX) +ADDRESS_SIZES_HOST := $(ART_PHONY_TEST_HOST_SUFFIX) +ifeq ($(ART_TEST_RUN_TEST_2ND_ARCH),true) + ADDRESS_SIZES_TARGET += $(2ND_ART_PHONY_TEST_TARGET_SUFFIX) + ADDRESS_SIZES_HOST += $(2ND_ART_PHONY_TEST_HOST_SUFFIX) +endif ALL_ADDRESS_SIZES := 64 32 # List all run test names with number arguments agreeing with the comment above. |