summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2016-01-29 11:37:48 +0000
committer Roland Levillain <rpl@google.com> 2016-01-29 11:37:48 +0000
commit560297fe39a0f181d7e7dd5f026a8c4a3d4abed1 (patch)
treea0b6ff64bad16b1fb52ab58ce78a5a934a8afe32
parent87d38b73fefe904feffa2c22036b8e822f1652f6 (diff)
Re-enable test 496-checker-inlining-and-class-loader with CC.
This test might have been affected by an app image change. Re-enable it so that we can monitor it on the concurrent collector configurations. Bug: 26786304 Bug: 12687968 Change-Id: Iab484418d4a507da6642eec86317d53cc0a2607a
-rw-r--r--test/Android.run-test.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index bc60c3f6b6..ab35ea1fe7 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -548,10 +548,8 @@ TEST_ART_BROKEN_OPTIMIZING_READ_BARRIER_RUN_TESTS := \
527-checker-array-access-split \
537-checker-arraycopy
-# Tests that should fail in the read barrier configuration with JIT.
-# 496: Occasional timeout: "Fault message: timeout: the monitored command dumped core" (b/26786304).
-TEST_ART_BROKEN_JIT_READ_BARRIER_RUN_TESTS := \
- 496-checker-inlining-and-class-loader
+# Tests that should fail in the read barrier configuration with JIT (Optimizing compiler).
+TEST_ART_BROKEN_JIT_READ_BARRIER_RUN_TESTS :=
ifeq ($(ART_USE_READ_BARRIER),true)
ifneq (,$(filter interpreter,$(COMPILER_TYPES)))