From 552836ddc04ac1ba6692bc97309a0f58105b4b8a Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 3 May 2017 13:09:47 +0200 Subject: Revert "Revert "Fix warnings hidden earlier due to including application headers as s…"" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vespalib/src/tests/alloc/alloc_test.cpp | 52 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'vespalib/src/tests/alloc') diff --git a/vespalib/src/tests/alloc/alloc_test.cpp b/vespalib/src/tests/alloc/alloc_test.cpp index 5da06091796..11372c0aebd 100644 --- a/vespalib/src/tests/alloc/alloc_test.cpp +++ b/vespalib/src/tests/alloc/alloc_test.cpp @@ -1,11 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -#include -#include -LOG_SETUP("alloc_test"); + #include #include #include +#include using namespace vespalib; using namespace vespalib::alloc; @@ -16,11 +14,11 @@ testSwap(T & a, T & b) { void * tmpA(a.get()); void * tmpB(b.get()); - EXPECT_EQUAL(4096u, a.size()); - EXPECT_EQUAL(8192, b.size()); + EXPECT_EQUAL(4096ul, a.size()); + EXPECT_EQUAL(8192ul, b.size()); std::swap(a, b); - EXPECT_EQUAL(4096u, b.size()); - EXPECT_EQUAL(8192, a.size()); + EXPECT_EQUAL(4096ul, b.size()); + EXPECT_EQUAL(8192ul, a.size()); EXPECT_EQUAL(tmpA, b.get()); EXPECT_EQUAL(tmpB, a.get()); } @@ -87,46 +85,46 @@ TEST("no rounding of small heap buffer") { TEST("no rounding of large heap buffer") { Alloc buf = Alloc::alloc(MemoryAllocator::HUGEPAGE_SIZE*11+3, MemoryAllocator::HUGEPAGE_SIZE*16); - EXPECT_EQUAL(MemoryAllocator::HUGEPAGE_SIZE*11+3, buf.size()); + EXPECT_EQUAL(size_t(MemoryAllocator::HUGEPAGE_SIZE*11+3), buf.size()); } TEST("rounding of small mmaped buffer") { Alloc buf = Alloc::alloc(MemoryAllocator::HUGEPAGE_SIZE); EXPECT_EQUAL(MemoryAllocator::HUGEPAGE_SIZE, buf.size()); buf = Alloc::alloc(MemoryAllocator::HUGEPAGE_SIZE+1); - EXPECT_EQUAL(MemoryAllocator::HUGEPAGE_SIZE*2, buf.size()); + EXPECT_EQUAL(MemoryAllocator::HUGEPAGE_SIZE*2ul, buf.size()); } TEST("rounding of large mmaped buffer") { Alloc buf = Alloc::alloc(MemoryAllocator::HUGEPAGE_SIZE*11+3); - EXPECT_EQUAL(MemoryAllocator::HUGEPAGE_SIZE*12, buf.size()); + EXPECT_EQUAL(MemoryAllocator::HUGEPAGE_SIZE*12ul, buf.size()); } TEST("heap alloc can not be extended") { Alloc buf = Alloc::allocHeap(100); void * oldPtr = buf.get(); - EXPECT_EQUAL(100, buf.size()); + EXPECT_EQUAL(100ul, buf.size()); EXPECT_FALSE(buf.resize_inplace(101)); EXPECT_EQUAL(oldPtr, buf.get()); - EXPECT_EQUAL(100, buf.size()); + EXPECT_EQUAL(100ul, buf.size()); } TEST("auto alloced heap alloc can not be extended") { Alloc buf = Alloc::alloc(100); void * oldPtr = buf.get(); - EXPECT_EQUAL(100, buf.size()); + EXPECT_EQUAL(100ul, buf.size()); EXPECT_FALSE(buf.resize_inplace(101)); EXPECT_EQUAL(oldPtr, buf.get()); - EXPECT_EQUAL(100, buf.size()); + EXPECT_EQUAL(100ul, buf.size()); } TEST("auto alloced heap alloc can not be extended, even if resize will be mmapped") { Alloc buf = Alloc::alloc(100); void * oldPtr = buf.get(); - EXPECT_EQUAL(100, buf.size()); + EXPECT_EQUAL(100ul, buf.size()); EXPECT_FALSE(buf.resize_inplace(MemoryAllocator::HUGEPAGE_SIZE*3)); EXPECT_EQUAL(oldPtr, buf.get()); - EXPECT_EQUAL(100, buf.size()); + EXPECT_EQUAL(100ul, buf.size()); } TEST("auto alloced mmap alloc can be extended if room") { @@ -183,10 +181,10 @@ TEST("mmap alloc can be extended if room") { } void * oldPtr = buf.get(); - EXPECT_EQUAL(4096, buf.size()); + EXPECT_EQUAL(4096ul, buf.size()); EXPECT_TRUE(buf.resize_inplace(4097)); EXPECT_EQUAL(oldPtr, buf.get()); - EXPECT_EQUAL(8192, buf.size()); + EXPECT_EQUAL(8192ul, buf.size()); } TEST("mmap alloc can not be extended if no room") { @@ -199,37 +197,37 @@ TEST("mmap alloc can not be extended if no room") { EXPECT_EQUAL(reserved.get(), static_cast(buf.get()) + buf.size()); void * oldPtr = buf.get(); - EXPECT_EQUAL(4096, buf.size()); + EXPECT_EQUAL(4096ul, buf.size()); EXPECT_FALSE(buf.resize_inplace(4097)); EXPECT_EQUAL(oldPtr, buf.get()); - EXPECT_EQUAL(4096, buf.size()); + EXPECT_EQUAL(4096ul, buf.size()); } TEST("heap alloc can not be shrinked") { Alloc buf = Alloc::allocHeap(101); void * oldPtr = buf.get(); - EXPECT_EQUAL(101, buf.size()); + EXPECT_EQUAL(101ul, buf.size()); EXPECT_FALSE(buf.resize_inplace(100)); EXPECT_EQUAL(oldPtr, buf.get()); - EXPECT_EQUAL(101, buf.size()); + EXPECT_EQUAL(101ul, buf.size()); } TEST("mmap alloc can be shrinked") { Alloc buf = Alloc::allocMMap(4097); void * oldPtr = buf.get(); - EXPECT_EQUAL(8192, buf.size()); + EXPECT_EQUAL(8192ul, buf.size()); EXPECT_TRUE(buf.resize_inplace(4095)); EXPECT_EQUAL(oldPtr, buf.get()); - EXPECT_EQUAL(4096, buf.size()); + EXPECT_EQUAL(4096ul, buf.size()); } TEST("auto alloced heap alloc can not be shrinked") { Alloc buf = Alloc::alloc(101); void * oldPtr = buf.get(); - EXPECT_EQUAL(101, buf.size()); + EXPECT_EQUAL(101ul, buf.size()); EXPECT_FALSE(buf.resize_inplace(100)); EXPECT_EQUAL(oldPtr, buf.get()); - EXPECT_EQUAL(101, buf.size()); + EXPECT_EQUAL(101ul, buf.size()); } TEST("auto alloced mmap alloc can be shrinked") { -- cgit v1.2.3