aboutsummaryrefslogtreecommitdiffstats
path: root/vespalib/src/tests/array/array_test.cpp
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-02-17 10:36:40 +0000
committerHarald Musum <musum@yahooinc.com>2022-02-17 10:36:40 +0000
commitbe3f2a6a448d9507b0bdde5c71cf6aab7d16ff40 (patch)
tree563e0bb2e9e8f9c2e5fb7a44a1210a283f7c9201 /vespalib/src/tests/array/array_test.cpp
parent42b783c285fedb4a406cd9421e4be3a49324507c (diff)
Handle diffrent page size
Diffstat (limited to 'vespalib/src/tests/array/array_test.cpp')
-rw-r--r--vespalib/src/tests/array/array_test.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/vespalib/src/tests/array/array_test.cpp b/vespalib/src/tests/array/array_test.cpp
index 5f80ee893da..d9519d3df87 100644
--- a/vespalib/src/tests/array/array_test.cpp
+++ b/vespalib/src/tests/array/array_test.cpp
@@ -4,6 +4,7 @@
#include <vespa/vespalib/testkit/testapp.h>
#include <vespa/vespalib/test/memory_allocator_observer.h>
#include <vespa/vespalib/util/array.hpp>
+#include <vespa/vespalib/util/round_up_to_page_size.h>
#include <vespa/vespalib/util/size_literals.h>
#include <deque>
#include <atomic>
@@ -333,18 +334,18 @@ struct UnreserveFixture {
UnreserveFixture() : arr(1025, 7, alloc::Alloc::allocMMap(0))
{
EXPECT_EQUAL(1025u, arr.size());
- EXPECT_EQUAL(2048u, arr.capacity());
+ EXPECT_EQUAL(round_up_to_page_size(1) == 64_Ki ? 16_Ki : 2_Ki, arr.capacity());
}
};
TEST_F("require that try_unreserve() fails if wanted capacity >= current capacity", UnreserveFixture)
{
- EXPECT_FALSE(f.arr.try_unreserve(2048));
+ EXPECT_FALSE(f.arr.try_unreserve(32_Ki));
}
TEST_F("require that try_unreserve() fails if wanted capacity < current size", UnreserveFixture)
{
- EXPECT_FALSE(f.arr.try_unreserve(1024));
+ EXPECT_FALSE(f.arr.try_unreserve(1_Ki));
}
TEST_F("require that try_unreserve() succeedes if mmap can be shrinked", UnreserveFixture)
@@ -352,7 +353,7 @@ TEST_F("require that try_unreserve() succeedes if mmap can be shrinked", Unreser
int *oldPtr = &f.arr[0];
f.arr.resize(512);
EXPECT_TRUE(f.arr.try_unreserve(1023));
- EXPECT_EQUAL(1_Ki, f.arr.capacity());
+ EXPECT_EQUAL(round_up_to_page_size(1) == 64_Ki ? 16_Ki : 1_Ki, f.arr.capacity());
int *newPtr = &f.arr[0];
EXPECT_EQUAL(oldPtr, newPtr);
}