commit f2197e43f42499be852a0fce2d755f25e2007be8
author Hiroshi Yamauchi <yamauchi@google.com> Thu Apr 07 21:10:54 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 07 21:10:54 2016 +0000
tree bc54e778acc05b816a8b60d4217d880a896ccd74
parent 2c6760a0eb1e05d3a89a6cca9d2746da3d547e9e
parent e1bcd8a96f3627703f0dfd13d037205fd4d0ef6c

Merge changes Ie23877ac,I262f6be8

* changes:
  Revert "Disable some image_test cases with concurrent collector."
  Fix image_test for the CC collector.

compiler/common_compiler_test.cc

diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index 0001b67..f75a252 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -285,7 +285,7 @@
   MemMap::Init();
   image_reservation_.reset(MemMap::MapAnonymous("image reservation",
                                                 reinterpret_cast<uint8_t*>(ART_BASE_ADDRESS),
-                                                (size_t)100 * 1024 * 1024,  // 100MB
+                                                (size_t)120 * 1024 * 1024,  // 120MB
                                                 PROT_NONE,
                                                 false /* no need for 4gb flag with fixed mmap*/,
                                                 false /* not reusing existing reservation */,

compiler/image_test.cc

diff --git a/compiler/image_test.cc b/compiler/image_test.cc
index 7779e44..91579e9 100644
--- a/compiler/image_test.cc
+++ b/compiler/image_test.cc
@@ -288,17 +288,14 @@
 }
 
 TEST_F(ImageTest, WriteReadUncompressed) {
-  TEST_DISABLED_FOR_READ_BARRIER();  // b/27578460
   TestWriteRead(ImageHeader::kStorageModeUncompressed);
 }
 
 TEST_F(ImageTest, WriteReadLZ4) {
-  TEST_DISABLED_FOR_READ_BARRIER();  // b/27578460
   TestWriteRead(ImageHeader::kStorageModeLZ4);
 }
 
 TEST_F(ImageTest, WriteReadLZ4HC) {
-  TEST_DISABLED_FOR_READ_BARRIER();  // b/27578460
   TestWriteRead(ImageHeader::kStorageModeLZ4HC);
 }