Make sure at least XX maps are created.
Rather than expect exactly one set of maps, make sure there are at
least XX number of maps.
Test: Ran the 32 bit and 64 bit variants of the benchmarks.
Change-Id: I34184eab3810e92e7f246aa810ddb18fab443c9a
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;
}