Make third_party/tensorflow/core/framework/allocator_test.cc less brittle in

the face of changes to malloc().

This change both adjusts the numbers and adds 5kBytes of slop on either side of
the numbers in the hope of avoiding trivial breakage.
Change: 140060311

1 files changed, 9 insertions, 5 deletions

diff --git a/tensorflow/core/framework/allocator_test.cc b/tensorflow/core/framework/allocator_test.cc
index 25478888ca..b5587a7b05 100644
--- a/tensorflow/core/framework/allocator_test.cc
+++ b/tensorflow/core/framework/allocator_test.cc
@@ -30,9 +30,13 @@ static void CheckStats(Allocator* a, int64 num_allocs, int64 bytes_in_use,
   a->GetStats(&stats);
   LOG(INFO) << "Alloc stats: \n" << stats.DebugString();
 #if defined(PLATFORM_GOOGLE) && defined(NDEBUG)
-  // NOTE: allocator stats expectation depends on the system malloc.
-  EXPECT_EQ(stats.bytes_in_use, bytes_in_use);
-  EXPECT_EQ(stats.max_bytes_in_use, max_bytes_in_use);
+  // NOTE: allocator stats expectation depends on the system malloc,
+  // and can vary as that changes.
+  static const int64 kSlop = 5 * 1024;
+  EXPECT_GT(stats.bytes_in_use, bytes_in_use - kSlop);
+  EXPECT_LT(stats.bytes_in_use, bytes_in_use + kSlop);
+  EXPECT_GT(stats.max_bytes_in_use, max_bytes_in_use - kSlop);
+  EXPECT_LT(stats.max_bytes_in_use, max_bytes_in_use + kSlop);
   EXPECT_EQ(stats.num_allocs, num_allocs);
   EXPECT_EQ(stats.max_alloc_size, max_alloc_size);
 #endif
@@ -67,14 +71,14 @@ TEST(CPUAllocatorTest, Simple) {
     ptrs.push_back(raw);
   }
   std::sort(ptrs.begin(), ptrs.end());
-  CheckStats(a, 1023, 549056, 549056, 1024);
+  CheckStats(a, 1023, 552640, 552640, 1024);
   for (size_t i = 0; i < ptrs.size(); i++) {
     if (i > 0) {
       CHECK_NE(ptrs[i], ptrs[i - 1]);  // No dups
     }
     a->DeallocateRaw(ptrs[i]);
   }
-  CheckStats(a, 1023, 0, 549056, 1024);
+  CheckStats(a, 1023, 0, 552640, 1024);
   float* t1 = a->Allocate<float>(1024);
   double* t2 = a->Allocate<double>(1048576);
   CheckStats(a, 1025, 1048576 * sizeof(double) + 1024 * sizeof(float),