diff options
| author | 2015-05-21 17:09:21 +0000 | |
|---|---|---|
| committer | 2015-05-21 17:09:21 +0000 | |
| commit | 12beecf84130780915c1bdc97d80f9715ce941d2 (patch) | |
| tree | 699c9637d88c6a7902be932b275521c995cb1934 | |
| parent | dc80984a9e24d6e46fab9461f01d7a27e656cf90 (diff) | |
| parent | 4437219a6cffe2609eb3d31f4ce484ea3622fdf8 (diff) | |
Merge "ART: Blacklist CFI test for Heap Poisoning"
| -rw-r--r-- | test/Android.run-test.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index a3a639b555..8b074ae04f 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -475,6 +475,19 @@ endif TEST_ART_BROKEN_READ_BARRIER_RUN_TESTS := +# Tests that should fail in the heap poisoning configuration. +# 137: Heap poisoning forces interpreter. Cannot run this with the interpreter. +TEST_ART_BROKEN_HEAP_POISONING_RUN_TESTS := \ + 137-cfi + +ifeq ($(ART_HEAP_POISONING),true) + ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \ + $(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \ + $(IMAGE_TYPES),$(PICTEST_TYPES),$(DEBUGGABLE_TYPES),$(TEST_ART_BROKEN_HEAP_POISONING_RUN_TESTS),$(ALL_ADDRESS_SIZES)) +endif + +TEST_ART_BROKEN_HEAP_POISONING_RUN_TESTS := + # Test 137-cfi works in 32-bit only until we enable 64-bit ELF files. ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \ $(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \ |