summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-07-24 00:12:14 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-07-24 00:12:14 +0000
commit28e535bd94c84d1019f18c46e189928435e2938d (patch)
treea078f294a0f80a5a227bd4ce03d566feca157d37
parent62432ae776aa618082865b40b111dbff75aedeb6 (diff)
parent78627e4e4df5481e41836eed2e0fd8d5aa54841d (diff)
Merge "ART: Disable part of reg_type_test for CMS"
-rw-r--r--runtime/verifier/reg_type_test.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/verifier/reg_type_test.cc b/runtime/verifier/reg_type_test.cc
index fef13a2060..1aa0966f4f 100644
--- a/runtime/verifier/reg_type_test.cc
+++ b/runtime/verifier/reg_type_test.cc
@@ -689,6 +689,9 @@ class RegTypeOOMTest : public RegTypeTest {
};
TEST_F(RegTypeOOMTest, ClassJoinOOM) {
+ // TODO: Figure out why FillHeap isn't good enough under CMS.
+ TEST_DISABLED_WITHOUT_BAKER_READ_BARRIERS();
+
// Tests that we don't abort with OOMs.
ArenaStack stack(Runtime::Current()->GetArenaPool());