summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-07-22 11:46:28 -0700
committerAndreas Gampe <agampe@google.com>2014-07-22 11:46:28 -0700
commit508c1c1b89d37ba74c01de7c1b8c01342770be8a (patch)
tree5b274fcee85240ed9a75e697e38a0d8adf5a4acc /test
parent16fc9f617e395758eb95b5f2124c79a828186b55 (diff)
downloadart-508c1c1b89d37ba74c01de7c1b8c01342770be8a.zip
art-508c1c1b89d37ba74c01de7c1b8c01342770be8a.tar.gz
art-508c1c1b89d37ba74c01de7c1b8c01342770be8a.tar.bz2
ART: Blacklist relocate option in oat tests
To avoid overwriting issues when running the relocate option for oat tests, blacklist them. Change-Id: I37685a761fd0949502da134690d88ba2a399ea44
Diffstat (limited to 'test')
-rw-r--r--test/Android.oat.mk16
1 files changed, 16 insertions, 0 deletions
diff --git a/test/Android.oat.mk b/test/Android.oat.mk
index 111680a..a83c527 100644
--- a/test/Android.oat.mk
+++ b/test/Android.oat.mk
@@ -470,6 +470,22 @@ $(eval $(call define-test-art-oat-combination,host,HOST,-optimizing,_OPTIMIZING,
$(eval $(call define-test-art-oat-combination,host,HOST,-interpreter,_INTERPRETER,$(2ND_ART_PHONY_TEST_HOST_SUFFIX)))
endif
+# List -relocate version on the target as broken.
+
+# List all the test names for target and compiler variants.
+# $(1): test name, e.g. Main
+# $(2): -relocate, -norelocate, -prebuild, or undefined.
+define all-oat-test-target-names
+ test-art-target-oat-default$(2)-$(1)32 \
+ test-art-target-oat-optimizing$(2)-$(1)32 \
+ test-art-target-oat-interpreter$(2)-$(1)32 \
+ test-art-target-oat-default$(2)-$(1)64 \
+ test-art-target-oat-optimizing$(2)-$(1)64 \
+ test-art-target-oat-interpreter$(2)-$(1)64
+endef # all-oat-test-target-names
+
+ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_OAT_DIRECTORIES), $(call all-oat-test-target-names,$(test),-relocate))
+
# Clear locally defined variables.
define-test-art-oat-rule-target :=
define-test-art-oat-rules-target :=