summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2016-03-04 16:17:29 +0000
committer android-build-merger <android-build-merger@google.com> 2016-03-04 16:17:29 +0000
commit10d3e43dd0af5865d798be50441e3a5b6e6dbc1c (patch)
tree5c48ac66a17ba5788554a440b44493096a055dea
parent93c9e7dc5622886539bc79c571a6a2f7325771f4 (diff)
parentdd6c73a3b5a7eda84ede063832a5a12dff6f7ccd (diff)
Merge "Ignore 145-alloc-tracking-stress failures in interpreter with CC."
am: dd6c73a3b5 * commit 'dd6c73a3b5a7eda84ede063832a5a12dff6f7ccd': Ignore 145-alloc-tracking-stress failures in interpreter with CC.
-rw-r--r--test/Android.run-test.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index e05d4f54c5..c4f0171f0d 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -541,7 +541,9 @@ endif
TEST_ART_BROKEN_OPTIMIZING_DEBUGGABLE_RUN_TESTS :=
# Tests that should fail in the read barrier configuration with the interpreter.
-TEST_ART_BROKEN_INTERPRETER_READ_BARRIER_RUN_TESTS :=
+# 145: Test sometimes times out in read barrier configuration (b/27467554).
+TEST_ART_BROKEN_INTERPRETER_READ_BARRIER_RUN_TESTS := \
+ 145-alloc-tracking-stress
# Tests that should fail in the read barrier configuration with the default (Quick) compiler (AOT).
# Quick has no support for read barriers and punts to the interpreter, so this list is composed of