commit c9d4a5b8c51851b4e06a02b3ad8f88949923b959
author Christopher Ferris <cferris@google.com> Sat Dec 09 03:37:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 09 03:37:07 2017 +0000
tree 1c3cad69eb9b08bf9097f108af438ae8956268e2
parent 6449a13ee753e8ece91c4c98f0848cc4ff194049
parent 6d91f3180339654431882d6232426247ac000154

Merge "Make sure at least XX maps are created." am: 4dac55d5fd am: abae1313d1
am: 9ade8fcd0b

Change-Id: I721cf33c4b69b08260eccbde1ed545caa9cdc124

libbacktrace/backtrace_benchmarks.cpp

diff --git a/libbacktrace/backtrace_benchmarks.cpp b/libbacktrace/backtrace_benchmarks.cpp
index bb4134f..a23e3b4 100644
--- a/libbacktrace/backtrace_benchmarks.cpp
+++ b/libbacktrace/backtrace_benchmarks.cpp
@@ -103,8 +103,9 @@
       exit(1);
     }
 
-    if (num_maps != kNumMaps) {
-      fprintf(stderr, "Maps set incorrectly: %zu found, %zu expected.\n", num_maps, kNumMaps);
+    if (num_maps < kNumMaps) {
+      fprintf(stderr, "Maps set incorrectly: %zu found, %zu expected at least.\n", num_maps,
+              kNumMaps);
       std::string str;
       android::base::ReadFileToString("/proc/self/maps", &str);
       fprintf(stderr, "%s\n", str.c_str());
@@ -121,12 +122,12 @@
 
   size_t num_maps = 0;
   for (size_t i = 0; i < 2000; i++) {
-    if (CountMaps(pid, &num_maps) && num_maps == kNumMaps) {
+    if (CountMaps(pid, &num_maps) && num_maps >= kNumMaps) {
       break;
     }
     usleep(1000);
   }
-  if (num_maps != kNumMaps) {
+  if (num_maps < kNumMaps) {
     fprintf(stderr, "Timed out waiting for the number of maps available: %zu\n", num_maps);
     return;
   }