From e6c32d1b6293c1cc5ce92854855cc24dea697c72 Mon Sep 17 00:00:00 2001 From: Peter Griess Date: Thu, 10 Oct 2013 10:51:28 -0700 Subject: [PATCH] Remove check that depends on malloc implementation. Summary: - The EXPECT_EQ(vec.capacity(), vec2.capacity()) check is implicitly testing how the platform's malloc() and malloc_usable_size() implementations interact. We know that small_vector will attempt to allocate storage for 3 elements via malloc(), but the small_vector implementation then uses malloc_usable_size() to determine capacity, which can return more than the size requested by malloc(). As a result, capacity may grow more than expected depending on how the malloc implementation works. Test Plan: - fbconfig -r folly && fbmake runtests - ./configure && make check on Ubuntu/FC/Mac Reviewed By: alandau@fb.com FB internal diff: D1008922 --- folly/test/small_vector_test.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/folly/test/small_vector_test.cpp b/folly/test/small_vector_test.cpp index 3df4fb97..1f059f47 100644 --- a/folly/test/small_vector_test.cpp +++ b/folly/test/small_vector_test.cpp @@ -676,9 +676,6 @@ TEST(small_vector, Capacity) { EXPECT_EQ(vec2.size(), 3); EXPECT_GT(vec2.capacity(), 2); - // Both have grown by the minimum amount - EXPECT_EQ(vec.capacity(), vec2.capacity()); - // Test capacity heapifying logic folly::small_vector vec3; const size_t hc_size = 1000000; -- 2.34.1