commit 2dd6f729c05ff9a6c687888707c68e7894392c38
author Nicolas Geoffray <ngeoffray@google.com> Tue Jul 29 08:06:39 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 23 19:33:25 2014 +0000
tree 6b154e83a56431e263a7f7568b89f74d436044ad
parent 9d2f0100840a41ed6c6c95f92994db7975a8a211
parent 3bb12b9bea020e2b797ec3fe6bc253d33189ed97

Merge "Add a variable to disable PREBUILD in run-tests."

build/Android.common_test.mk

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 @@
 # 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) ] || \

test/Android.run-test.mk

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 @@
       else
         uc_reloc_type := PREBUILD
         run_test_options += --relocate --prebuild
+        ifneq ($(ART_TEST_RUN_TEST_PREBUILD),true)
+          skip_test := true
       endif
     endif
   endif