From 4437219a6cffe2609eb3d31f4ce484ea3622fdf8 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 21 May 2015 10:01:42 -0700 Subject: [PATCH] ART: Blacklist CFI test for Heap Poisoning The test expects Java frames on the stack. Change-Id: I19e7429f06fac107c2cf9f85325e8f071e5799fb --- test/Android.run-test.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index a3a639b55..8b074ae04 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), \ -- 2.11.0