diff options
| author | Elliott Hughes <enh@google.com> | 2016-03-01 20:07:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-01 20:07:42 +0000 |
| commit | 02235d5d8d8f20559803ac30ed367cb968cfa207 (patch) | |
| tree | 830003dc5c3567bd57d9156552d9ca7b9f873e8d /libpagemap | |
| parent | fe4b8f25e275c255f12fe3767d1e2fa4e31a9d2f (diff) | |
| parent | 5dc5241d7785569a6a4b65df475ac9451cdfe531 (diff) | |
| download | extras-02235d5d8d8f20559803ac30ed367cb968cfa207.tar.gz | |
Merge "Fix pagemap_test#maps."
am: 5dc5241d77
* commit '5dc5241d7785569a6a4b65df475ac9451cdfe531':
Fix pagemap_test#maps.
Diffstat (limited to 'libpagemap')
| -rw-r--r-- | libpagemap/pagemap_test.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libpagemap/pagemap_test.cpp b/libpagemap/pagemap_test.cpp index ccbc211d..592072c6 100644 --- a/libpagemap/pagemap_test.cpp +++ b/libpagemap/pagemap_test.cpp @@ -14,10 +14,12 @@ * limitations under the License. */ -#include <gtest/gtest.h> - #include <pagemap/pagemap.h> +#include <string> + +#include <gtest/gtest.h> + TEST(pagemap, maps) { pm_kernel_t* kernel; ASSERT_EQ(0, pm_kernel_create(&kernel)); @@ -32,8 +34,9 @@ TEST(pagemap, maps) { bool found_heap = false; bool found_stack = false; for (size_t i = 0; i < num_maps; i++) { - if (strcmp(maps[i]->name, "[heap]") == 0) found_heap = true; - if (strcmp(maps[i]->name, "[stack]") == 0) found_stack = true; + std::string name(maps[i]->name); + if (name == "[heap]" || name == "[anon:libc_malloc]") found_heap = true; + if (name == "[stack]") found_stack = true; } ASSERT_TRUE(found_heap); |