diff options
Diffstat (limited to 'vespalib/src/tests')
| -rw-r--r-- | vespalib/src/tests/datastore/array_store/array_store_test.cpp | 10 | ||||
| -rw-r--r-- | vespalib/src/tests/datastore/unique_store/unique_store_test.cpp | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/vespalib/src/tests/datastore/array_store/array_store_test.cpp b/vespalib/src/tests/datastore/array_store/array_store_test.cpp index c32554232ef..8ee9eaeb4f7 100644 --- a/vespalib/src/tests/datastore/array_store/array_store_test.cpp +++ b/vespalib/src/tests/datastore/array_store/array_store_test.cpp @@ -209,13 +209,9 @@ INSTANTIATE_TEST_SUITE_P(NumberStoreFreeListsDisabledMultiTest, testing::PrintToStringParamName()); TEST_P(NumberStoreTest, control_static_sizes) { -#ifdef _LIBCPP_VERSION - EXPECT_EQ(464u, sizeof(store)); - EXPECT_EQ(280u, sizeof(NumberStoreTest::ArrayStoreType::DataStoreType)); -#else - EXPECT_EQ(496u, sizeof(store)); - EXPECT_EQ(320u, sizeof(NumberStoreTest::ArrayStoreType::DataStoreType)); -#endif + static constexpr size_t sizeof_deque = vespalib::datastore::DataStoreBase::sizeof_entry_ref_hold_list_deque; + EXPECT_EQ(416u + sizeof_deque, sizeof(store)); + EXPECT_EQ(240u + sizeof_deque, sizeof(NumberStoreTest::ArrayStoreType::DataStoreType)); EXPECT_EQ(112u, sizeof(NumberStoreTest::ArrayStoreType::SmallBufferType)); MemoryUsage usage = store.getMemoryUsage(); EXPECT_EQ(202144u, usage.allocatedBytes()); diff --git a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp index 1781a680bac..0de44eb373e 100644 --- a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp +++ b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp @@ -470,7 +470,8 @@ TEST_F(DoubleTest, nan_is_handled) } TEST_F(DoubleTest, control_memory_usage) { - EXPECT_EQ(456u, sizeof(store)); + static constexpr size_t sizeof_deque = vespalib::datastore::DataStoreBase::sizeof_entry_ref_hold_list_deque; + EXPECT_EQ(376u + sizeof_deque, sizeof(store)); EXPECT_EQ(144u, sizeof(BufferState)); EXPECT_EQ(28740u, store.get_values_memory_usage().allocatedBytes()); EXPECT_EQ(24804u, store.get_values_memory_usage().usedBytes()); |