diff options
author | 2016-04-07 21:10:54 +0000 | |
---|---|---|
committer | 2016-04-07 21:10:54 +0000 | |
commit | f2197e43f42499be852a0fce2d755f25e2007be8 (patch) | |
tree | bc54e778acc05b816a8b60d4217d880a896ccd74 /compiler/common_compiler_test.cc | |
parent | 2c6760a0eb1e05d3a89a6cca9d2746da3d547e9e (diff) | |
parent | e1bcd8a96f3627703f0dfd13d037205fd4d0ef6c (diff) |
Merge changes Ie23877ac,I262f6be8
* changes:
Revert "Disable some image_test cases with concurrent collector."
Fix image_test for the CC collector.
Diffstat (limited to 'compiler/common_compiler_test.cc')
-rw-r--r-- | compiler/common_compiler_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 0001b672be..f75a252df2 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -285,7 +285,7 @@ void CommonCompilerTest::ReserveImageSpace() { 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 */, |