diff options
| author | 2014-07-29 08:06:39 +0000 | |
|---|---|---|
| committer | 2014-07-23 19:33:25 +0000 | |
| commit | 2dd6f729c05ff9a6c687888707c68e7894392c38 (patch) | |
| tree | 6b154e83a56431e263a7f7568b89f74d436044ad | |
| parent | 9d2f0100840a41ed6c6c95f92994db7975a8a211 (diff) | |
| parent | 3bb12b9bea020e2b797ec3fe6bc253d33189ed97 (diff) | |
Merge "Add a variable to disable PREBUILD in run-tests."
| -rw-r--r-- | build/Android.common_test.mk | 3 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk index 1967968957..59536e2247 100644 --- a/build/Android.common_test.mk +++ b/build/Android.common_test.mk @@ -78,6 +78,9 @@ ART_TEST_RUN_TEST_NO_RELOCATE ?= $(ART_TEST_FULL) # Do you want run-tests with prebuild disabled? ART_TEST_RUN_TEST_NO_PREBUILD ?= $(ART_TEST_FULL) +# Do you want run-tests with prebuild enabled? +ART_TEST_RUN_TEST_PREBUILD ?= true + # Define the command run on test failure. $(1) is the name of the test. Executed by the shell. define ART_TEST_FAILED ( [ -f $(ART_HOST_TEST_DIR)/skipped/$(1) ] || \ diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 4fea0fb8ed..d05c9c9947 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -365,6 +365,8 @@ define define-test-art-run-test else uc_reloc_type := PREBUILD run_test_options += --relocate --prebuild + ifneq ($(ART_TEST_RUN_TEST_PREBUILD),true) + skip_test := true endif endif endif |