From bad9e55ea52abd1bb759b800d85aa8952e315af1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 26 May 2016 10:09:46 -0400 Subject: fix signed warning errors in unittests A bunch of gtest assert statements fail due to signed warnings as unadorned constants are treated as signed integers. Mark them all unsigned to avoid that. One example (focus on the "[with ...]" blocks that show the types): In file included from src/breakpad_googletest_includes.h:33:0, from src/common/memory_unittest.cc:30: src/testing/gtest/include/gtest/gtest.h: In instantiation of 'testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = long unsigned int]': src/testing/gtest/include/gtest/gtest.h:1524:23: required from 'static testing::AssertionResult testing::internal::EqHelper::Compare(const char*, const char*, const T1&, const T2&, typename testing::internal::EnableIf<(! testing::internal::is_pointer::value)>::type*) [with T1 = int; T2 = long unsigned int; typename testing::internal::EnableIf<(! testing::internal::is_pointer::value)>::type = void]' src/common/memory_unittest.cc:41:246: required from here src/testing/gtest/include/gtest/gtest.h:1448:16: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] if (expected == actual) { ^ cc1plus: some warnings being treated as errors Makefile:5180: recipe for target 'src/common/src_client_linux_linux_client_unittest_shlib-memory_unittest.o' failed make[2]: *** [src/common/src_client_linux_linux_client_unittest_shlib-memory_unittest.o] Error 1 R=ted.mielczarek@gmail.com Review URL: https://codereview.chromium.org/2013893003 . --- src/common/memory_unittest.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/common') diff --git a/src/common/memory_unittest.cc b/src/common/memory_unittest.cc index b271bc3c..8d2494c2 100644 --- a/src/common/memory_unittest.cc +++ b/src/common/memory_unittest.cc @@ -38,13 +38,13 @@ typedef testing::Test PageAllocatorTest; TEST(PageAllocatorTest, Setup) { PageAllocator allocator; - EXPECT_EQ(0, allocator.pages_allocated()); + EXPECT_EQ(0U, allocator.pages_allocated()); } TEST(PageAllocatorTest, SmallObjects) { PageAllocator allocator; - EXPECT_EQ(0, allocator.pages_allocated()); + EXPECT_EQ(0U, allocator.pages_allocated()); for (unsigned i = 1; i < 1024; ++i) { uint8_t *p = reinterpret_cast(allocator.Alloc(i)); ASSERT_FALSE(p == NULL); @@ -55,10 +55,10 @@ TEST(PageAllocatorTest, SmallObjects) { TEST(PageAllocatorTest, LargeObject) { PageAllocator allocator; - EXPECT_EQ(0, allocator.pages_allocated()); + EXPECT_EQ(0U, allocator.pages_allocated()); uint8_t *p = reinterpret_cast(allocator.Alloc(10000)); ASSERT_FALSE(p == NULL); - EXPECT_EQ(3, allocator.pages_allocated()); + EXPECT_EQ(3U, allocator.pages_allocated()); for (unsigned i = 1; i < 10; ++i) { uint8_t *p = reinterpret_cast(allocator.Alloc(i)); ASSERT_FALSE(p == NULL); @@ -79,7 +79,7 @@ TEST(WastefulVectorTest, Setup) { TEST(WastefulVectorTest, Simple) { PageAllocator allocator_; - EXPECT_EQ(0, allocator_.pages_allocated()); + EXPECT_EQ(0U, allocator_.pages_allocated()); wasteful_vector v(&allocator_); for (unsigned i = 0; i < 256; ++i) { @@ -89,7 +89,7 @@ TEST(WastefulVectorTest, Simple) { } ASSERT_FALSE(v.empty()); ASSERT_EQ(v.size(), 256u); - EXPECT_EQ(1, allocator_.pages_allocated()); + EXPECT_EQ(1U, allocator_.pages_allocated()); for (unsigned i = 0; i < 256; ++i) ASSERT_EQ(v[i], i); } @@ -97,7 +97,7 @@ TEST(WastefulVectorTest, Simple) { TEST(WastefulVectorTest, UsesPageAllocator) { PageAllocator allocator_; wasteful_vector v(&allocator_); - EXPECT_EQ(1, allocator_.pages_allocated()); + EXPECT_EQ(1U, allocator_.pages_allocated()); v.push_back(1); ASSERT_TRUE(allocator_.OwnsPointer(&v[0])); @@ -105,20 +105,20 @@ TEST(WastefulVectorTest, UsesPageAllocator) { TEST(WastefulVectorTest, AutoWastefulVector) { PageAllocator allocator_; - EXPECT_EQ(0, allocator_.pages_allocated()); + EXPECT_EQ(0U, allocator_.pages_allocated()); auto_wasteful_vector v(&allocator_); - EXPECT_EQ(0, allocator_.pages_allocated()); + EXPECT_EQ(0U, allocator_.pages_allocated()); v.push_back(1); - EXPECT_EQ(0, allocator_.pages_allocated()); + EXPECT_EQ(0U, allocator_.pages_allocated()); EXPECT_FALSE(allocator_.OwnsPointer(&v[0])); v.resize(4); - EXPECT_EQ(0, allocator_.pages_allocated()); + EXPECT_EQ(0U, allocator_.pages_allocated()); EXPECT_FALSE(allocator_.OwnsPointer(&v[0])); v.resize(10); - EXPECT_EQ(1, allocator_.pages_allocated()); + EXPECT_EQ(1U, allocator_.pages_allocated()); EXPECT_TRUE(allocator_.OwnsPointer(&v[0])); } -- cgit v1.2.1