commit 430afefe1cced35cf5eb12ce7a6dcbfc5007c97e
author David Srbecky <dsrbecky@google.com> Tue Jun 09 01:41:11 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 09 01:41:12 2015 +0000
tree f36f114324ace1b92f7174c6b98a9d4220a76aa7
parent 0f6833940b4c58884ebab685d8d22e56c02be0d5
parent f50fa82c47115c95acb66b8a17362b6ae6bee0b6

Merge "Enable 64-bit CFI tests."

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 3ca1c06..e95f147 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -473,11 +473,6 @@
 
 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), \
-    $(IMAGE_TYPES),$(PICTEST_TYPES),$(DEBUGGABLE_TYPES),137-cfi,64)
-
 # Clear variables ahead of appending to them when defining tests.
 $(foreach target, $(TARGET_TYPES), $(eval ART_RUN_TEST_$(call name-to-var,$(target))_RULES :=))
 $(foreach target, $(TARGET_TYPES), \