aboutsummaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2021-03-04 10:57:26 +0100
committerTor Egge <Tor.Egge@broadpark.no>2021-03-04 11:06:03 +0100
commita815447f4de43fd276aa20609d1727d0fe365220 (patch)
treeb7456971b89b017506bf39fa0e1ce073ff6fb293 /vespalib
parent537014fa83b4d00ca326c4f077125de0b1c9b892 (diff)
Remove duplicate test.
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/tests/alloc/alloc_test.cpp28
1 files changed, 1 insertions, 27 deletions
diff --git a/vespalib/src/tests/alloc/alloc_test.cpp b/vespalib/src/tests/alloc/alloc_test.cpp
index d37abb15c2f..52b11e7dbc0 100644
--- a/vespalib/src/tests/alloc/alloc_test.cpp
+++ b/vespalib/src/tests/alloc/alloc_test.cpp
@@ -2,7 +2,7 @@
#include <vespa/vespalib/testkit/testapp.h>
#include <vespa/vespalib/util/alloc.h>
-#include <vespa/vespalib/util/mmap_file_allocator.h>
+#include <vespa/vespalib/util/memory_allocator.h>
#include <vespa/vespalib/util/exceptions.h>
#include <vespa/vespalib/util/size_literals.h>
#include <cstddef>
@@ -297,30 +297,4 @@ TEST("auto alloced mmap alloc can not be shrinked below HUGEPAGE_SIZE/2 + 1 ") {
EXPECT_EQUAL(SZ, buf.size());
}
-TEST("mmap file allocator works")
-{
- MmapFileAllocator allocator("mmap-file-allocator-dir");
- auto alloc = Alloc::alloc_with_allocator(&allocator);
- auto buf = alloc.create(0);
- EXPECT_EQUAL(0u, allocator.get_end_offset());
- EXPECT_EQUAL(0u, buf.size());
- EXPECT_TRUE(buf.get() == nullptr);
- buf = alloc.create(4);
- EXPECT_LESS_EQUAL(4u, buf.size());
- EXPECT_TRUE(buf.get() != nullptr);
- memcpy(buf.get(), "1st", 4);
- auto buf2 = alloc.create(5);
- EXPECT_LESS_EQUAL(5u, buf2.size());
- EXPECT_TRUE(buf2.get() != nullptr);
- EXPECT_TRUE(buf.get() != buf2.get());
- memcpy(buf2.get(), "fine", 5);
- EXPECT_FALSE(buf.resize_inplace(5));
- EXPECT_FALSE(buf.resize_inplace(3));
- EXPECT_NOT_EQUAL(0u, allocator.get_end_offset());
- int result = msync(buf.get(), buf.size(), MS_SYNC);
- EXPECT_EQUAL(0, result);
- result = msync(buf2.get(), buf2.size(), MS_SYNC);
- EXPECT_EQUAL(0, result);
-}
-
TEST_MAIN() { TEST_RUN_ALL(); }