diff options
author | Christopher Ferris <cferris@google.com> | 2019-08-09 15:36:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-09 15:36:07 +0000 |
commit | c0dabf28cad04993dd7bf8184af71f3230afa64f (patch) | |
tree | fd45d095a9e7a37b63f1c4b1f340d4aa3a3345f3 | |
parent | f36aa2b28a503e6ba57367d52b8cbda2de2d06af (diff) | |
parent | 5bfd768b8dca4c81adf630fa91da03d80f444312 (diff) | |
download | extras-c0dabf28cad04993dd7bf8184af71f3230afa64f.tar.gz |
Merge "Fix test broken by PSS to RSS change."
-rw-r--r-- | memory_replay/Android.bp | 16 | ||||
-rw-r--r-- | memory_replay/tests/NativeInfoTest.cpp | 68 |
2 files changed, 42 insertions, 42 deletions
diff --git a/memory_replay/Android.bp b/memory_replay/Android.bp index 753b8add..a21a6265 100644 --- a/memory_replay/Android.bp +++ b/memory_replay/Android.bp @@ -47,6 +47,13 @@ cc_defaults { ], shared_libs: ["libbase"], +} + +cc_binary { + name: "memory_replay", + defaults: ["memory_replay_defaults"], + + srcs: ["main.cpp"], multilib: { lib32: { @@ -56,19 +63,12 @@ cc_defaults { suffix: "64", }, }, - -} - -cc_binary { - name: "memory_replay", - defaults: ["memory_replay_defaults"], - - srcs: ["main.cpp"], } cc_test { name: "memory_replay_tests", defaults: ["memory_replay_defaults"], + isolated: true, srcs: [ "tests/ActionTest.cpp", 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); } |