commit 2e938a47483a4625ce7295c8d3686fb3356ff5f7
author Vitaly Buka <vitalybuka@google.com> Tue May 25 15:25:05 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 25 19:12:01 2021 -0700
tree 4097f120dae178abe5fa9dd170e31774c4a85ab5
parent bbc509d13cc16b98f5cd654303e547101db15d4a

[NFC][SCUDO] Fix unittest for -gtest_repeat=10

Reviewed By: cryptoad

Differential Revision: https://reviews.llvm.org/D103122

GitOrigin-RevId: e14696bfd740edb3f2fa7b9f36022f36000742ec

tests/common_test.cpp

diff --git a/tests/common_test.cpp b/tests/common_test.cpp
index 832f01d..2c79487 100644
--- a/tests/common_test.cpp
+++ b/tests/common_test.cpp
@@ -39,12 +39,12 @@
       map(nullptr, Size, "ResidentMemorySize", 0, &Data));
   const ptrdiff_t N = Size / sizeof(*P);
   ASSERT_NE(nullptr, P);
-  EXPECT_EQ(std::count(P, P + N, 0), N);
   EXPECT_LT(getResidentMemorySize() - OnStart, Threshold);
+  EXPECT_EQ(std::count(P, P + N, 0), N);
 
   memset(P, 1, Size);
   EXPECT_EQ(std::count(P, P + N, 0), 0);
-  EXPECT_LT(getResidentMemorySize() - Size, Threshold);
+  EXPECT_GT(getResidentMemorySize() - OnStart, Size - Threshold);
 
   releasePagesToOS((uptr)P, 0, Size, &Data);
   EXPECT_EQ(std::count(P, P + N, 0), N);
@@ -53,7 +53,9 @@
 
   memset(P, 1, Size);
   EXPECT_EQ(std::count(P, P + N, 0), 0);
-  EXPECT_LT(getResidentMemorySize() - Size, Threshold);
+  EXPECT_GT(getResidentMemorySize() - OnStart, Size - Threshold);
+
+  unmap(P, Size, 0, &Data);
 }
 
 } // namespace scudo