diff options
| author | Christopher Ferris <cferris@google.com> | 2019-08-08 15:07:36 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2019-08-08 17:05:45 -0700 |
| commit | 5bfd768b8dca4c81adf630fa91da03d80f444312 (patch) | |
| tree | 196bf2017cd7005cb4aa690c0c30a6e559444e13 /memory_replay/tests/NativeInfoTest.cpp | |
| parent | 0ac62db142ad1cd1cc745eac9f9f660c24b9523a (diff) | |
| download | extras-5bfd768b8dca4c81adf630fa91da03d80f444312.tar.gz | |
Fix test broken by PSS to RSS change.
Also, make the tests isolated and remove the suffix on the unit
test executable.
Bug: 138394907
Test: Unit tests pass now.
Change-Id: Iefe0e1738a2c9eda5cc220c55dfd91e4ff0e5a5f
Diffstat (limited to 'memory_replay/tests/NativeInfoTest.cpp')
| -rw-r--r-- | memory_replay/tests/NativeInfoTest.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/memory_replay/tests/NativeInfoTest.cpp b/memory_replay/tests/NativeInfoTest.cpp index e0dea509..44c87704 100644 --- a/memory_replay/tests/NativeInfoTest.cpp +++ b/memory_replay/tests/NativeInfoTest.cpp @@ -41,8 +41,8 @@ TEST_F(NativeInfoTest, no_matching) { std::string smaps_data = "b6f1a000-b6f1c000 rw-p 00000000 00:00 0 [anon:thread signal stack]\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 12 kB\n" + "Rss: 12 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -59,10 +59,10 @@ TEST_F(NativeInfoTest, no_matching) { write(tmp_file_->fd, smaps_data.c_str(), smaps_data.size())) != -1); ASSERT_TRUE(lseek(tmp_file_->fd, 0, SEEK_SET) != off_t(-1)); - size_t pss_bytes = 1; + size_t rss_bytes = 1; size_t va_bytes = 1; - GetNativeInfo(tmp_file_->fd, &pss_bytes, &va_bytes); - ASSERT_EQ(0U, pss_bytes); + GetNativeInfo(tmp_file_->fd, &rss_bytes, &va_bytes); + ASSERT_EQ(0U, rss_bytes); ASSERT_EQ(0U, va_bytes); } @@ -70,8 +70,8 @@ TEST_F(NativeInfoTest, multiple_anons) { std::string smaps_data = "b6f1a000-b6f1c000 rw-p 00000000 00:00 0 [anon:libc_malloc]\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 12 kB\n" + "Rss: 12 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -86,8 +86,8 @@ TEST_F(NativeInfoTest, multiple_anons) { "Name: [anon:libc_malloc]\n" "b6f1e000-b6f1f000 rw-p 00000000 00:00 0 [anon:libc_malloc]\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 20 kB\n" + "Rss: 20 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -102,8 +102,8 @@ TEST_F(NativeInfoTest, multiple_anons) { "Name: [anon:libc_malloc]\n" "b6f2e000-b6f2f000 rw-p 00000000 00:00 0\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 24 kB\n" + "Rss: 24 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -120,10 +120,10 @@ TEST_F(NativeInfoTest, multiple_anons) { write(tmp_file_->fd, smaps_data.c_str(), smaps_data.size())) != -1); ASSERT_TRUE(lseek(tmp_file_->fd, 0, SEEK_SET) != off_t(-1)); - size_t pss_bytes = 1; + size_t rss_bytes = 1; size_t va_bytes = 1; - GetNativeInfo(tmp_file_->fd, &pss_bytes, &va_bytes); - ASSERT_EQ(32768U, pss_bytes); + GetNativeInfo(tmp_file_->fd, &rss_bytes, &va_bytes); + ASSERT_EQ(32768U, rss_bytes); ASSERT_EQ(12288U, va_bytes); } @@ -131,8 +131,8 @@ TEST_F(NativeInfoTest, multiple_heaps) { std::string smaps_data = "b6f1a000-b6f1c000 rw-p 00000000 00:00 0 [heap]\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 24 kB\n" + "Rss: 24 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -147,8 +147,8 @@ TEST_F(NativeInfoTest, multiple_heaps) { "Name: [heap]\n" "b6f1e000-b6f1f000 rw-p 00000000 00:00 0 [heap]\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 20 kB\n" + "Rss: 20 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -163,8 +163,8 @@ TEST_F(NativeInfoTest, multiple_heaps) { "Name: [heap]\n" "b6f2e000-b6f2f000 rw-p 00000000 00:00 0\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 24 kB\n" + "Rss: 24 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -181,10 +181,10 @@ TEST_F(NativeInfoTest, multiple_heaps) { write(tmp_file_->fd, smaps_data.c_str(), smaps_data.size())) != -1); ASSERT_TRUE(lseek(tmp_file_->fd, 0, SEEK_SET) != off_t(-1)); - size_t pss_bytes = 1; + size_t rss_bytes = 1; size_t va_bytes = 1; - GetNativeInfo(tmp_file_->fd, &pss_bytes, &va_bytes); - ASSERT_EQ(45056U, pss_bytes); + GetNativeInfo(tmp_file_->fd, &rss_bytes, &va_bytes); + ASSERT_EQ(45056U, rss_bytes); ASSERT_EQ(12288U, va_bytes); } @@ -192,8 +192,8 @@ TEST_F(NativeInfoTest, mix_heap_anon) { std::string smaps_data = "b6f1a000-b6f1c000 rw-p 00000000 00:00 0 [heap]\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 32 kB\n" + "Rss: 32 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -208,8 +208,8 @@ TEST_F(NativeInfoTest, mix_heap_anon) { "Name: [heap]\n" "b6f1e000-b6f1f000 rw-p 00000000 00:00 0 [anon:skip]\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 32 kB\n" + "Rss: 32 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -224,8 +224,8 @@ TEST_F(NativeInfoTest, mix_heap_anon) { "Name: [anon:skip]\n" "b6f2e000-b6f2f000 rw-p 00000000 00:00 0 [anon:libc_malloc]\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 40 kB\n" + "Rss: 40 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -240,8 +240,8 @@ TEST_F(NativeInfoTest, mix_heap_anon) { "Name: [anon:libc_malloc]\n" "b6f3e000-b6f3f000 rw-p 00000000 00:00 0\n" "Size: 8 kB\n" - "Rss: 0 kB\n" - "Pss: 24 kB\n" + "Rss: 24 kB\n" + "Pss: 0 kB\n" "Shared_Clean: 0 kB\n" "Shared_Dirty: 0 kB\n" "Private_Clean: 0 kB\n" @@ -258,9 +258,9 @@ TEST_F(NativeInfoTest, mix_heap_anon) { write(tmp_file_->fd, smaps_data.c_str(), smaps_data.size())) != -1); ASSERT_TRUE(lseek(tmp_file_->fd, 0, SEEK_SET) != off_t(-1)); - size_t pss_bytes = 1; + size_t rss_bytes = 1; size_t va_bytes = 1; - GetNativeInfo(tmp_file_->fd, &pss_bytes, &va_bytes); - ASSERT_EQ(73728U, pss_bytes); + GetNativeInfo(tmp_file_->fd, &rss_bytes, &va_bytes); + ASSERT_EQ(73728U, rss_bytes); ASSERT_EQ(12288U, va_bytes); } |