commit e7debb51535f7b048bb679cb3fe30cac3715ce6b
author The Android Automerger <android-build@google.com> Thu Jan 21 00:01:13 2016 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 21 00:01:13 2016 -0800
tree 77fc8d9fda4cbeb71889c90ee45bd735ffa4820f
parent f35c4c963128f70f2c88d85222cff7ab30fe6553
parent 6ee75d65206cedddb00f63113b317ce5ff99b1c5

merge in nyc-release history after reset to master

runtime/mem_map_test.cc

diff --git a/runtime/mem_map_test.cc b/runtime/mem_map_test.cc
index 2f903c8..81c855e 100644
--- a/runtime/mem_map_test.cc
+++ b/runtime/mem_map_test.cc
@@ -251,6 +251,10 @@
 #endif
 
 TEST_F(MemMapTest, MapAnonymousExactAddr32bitHighAddr) {
+  // Some MIPS32 hardware (namely the Creator Ci20 development board)
+  // cannot allocate in the 2GB-4GB region.
+  TEST_DISABLED_FOR_MIPS();
+
   CommonInit();
   // This test may not work under valgrind.
   if (RUNNING_ON_MEMORY_TOOL == 0) {