[compiler-rt] e14696b - [NFC][SCUDO] Fix unittest for -gtest_repeat=10

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-05-25T15:32:42-07:00
New Revision: e14696bfd740edb3f2fa7b9f36022f36000742ec

URL: https://github.com/llvm/llvm-project/commit/e14696bfd740edb3f2fa7b9f36022f36000742ec
DIFF: https://github.com/llvm/llvm-project/commit/e14696bfd740edb3f2fa7b9f36022f36000742ec.diff

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

Reviewed By: cryptoad

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

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/tests/common_test.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/tests/common_test.cpp b/compiler-rt/lib/scudo/standalone/tests/common_test.cpp
index 832f01da3905..2c79487e77dd 100644
--- a/compiler-rt/lib/scudo/standalone/tests/common_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/common_test.cpp
@@ -39,12 +39,12 @@ TEST(ScudoCommonTest, SKIP_ON_FUCHSIA(ResidentMemorySize)) {
       map(nullptr, Size, "ResidentMemorySize", 0, &Data));
   const ptr
diff _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 @@ TEST(ScudoCommonTest, SKIP_ON_FUCHSIA(ResidentMemorySize)) {
 
   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