summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/Android.common_test.mk3
-rw-r--r--test/Android.run-test.mk2
2 files changed, 5 insertions, 0 deletions
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk
index 1967968..59536e2 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 4fea0fb..d05c9c9 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