From: Sage Weil <sage@inktank.com>
Date: Fri, 14 Mar 2014 19:46:57 +0000 (-0700)
Subject: unittest_ceph_argparse: fix warnings
X-Git-Tag: v0.78~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e941fefff800e9cb5897a4fb0b02d16eaf9f7309;p=ceph.git

unittest_ceph_argparse: fix warnings

In file included from test/ceph_argparse.cc:17:0:
../src/gtest/include/gtest/gtest.h: In function ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int, T2 = long unsigned int]’:
../src/gtest/include/gtest/gtest.h:1333:30: instantiated from ‘static testing::AssertionResult testing::internal::EqHelper::Compare(const char*, const char*, const T1&, const T2&) [with T1 = int, T2 = long unsigned int]’
test/ceph_argparse.cc:344:207: instantiated from here
warning: ../src/gtest/include/gtest/gtest.h:1263:3: comparison between signed and unsigned integer expressions [-Wsign-compare]

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/test/ceph_argparse.cc b/src/test/ceph_argparse.cc
index cc2ec9134e31..d1a790fdf181 100644
--- a/src/test/ceph_argparse.cc
+++ b/src/test/ceph_argparse.cc
@@ -341,18 +341,18 @@ TEST(CephArgParse, env_to_vec) {
     unsetenv("CEPH_ARGS");
     unsetenv("WHATEVER");
     env_to_vec(args);
-    EXPECT_EQ(0, args.size());
+    EXPECT_EQ(0u, args.size());
     env_to_vec(args, "WHATEVER");
-    EXPECT_EQ(0, args.size());
+    EXPECT_EQ(0u, args.size());
     args.push_back("a");
     setenv("CEPH_ARGS", "b c", 0);
     env_to_vec(args);
-    EXPECT_EQ(3, args.size());
+    EXPECT_EQ(3u, args.size());
     EXPECT_EQ(string("b"), args[1]);
     EXPECT_EQ(string("c"), args[2]);
     setenv("WHATEVER", "d e", 0);
     env_to_vec(args, "WHATEVER");
-    EXPECT_EQ(5, args.size());
+    EXPECT_EQ(5u, args.size());
     EXPECT_EQ(string("d"), args[3]);
     EXPECT_EQ(string("e"), args[4]);
   }
@@ -364,7 +364,7 @@ TEST(CephArgParse, env_to_vec) {
     args.push_back("c");
     setenv("CEPH_ARGS", "b -- d", 0);
     env_to_vec(args);
-    EXPECT_EQ(5, args.size());
+    EXPECT_EQ(5u, args.size());
     EXPECT_EQ(string("a"), args[0]);
     EXPECT_EQ(string("b"), args[1]);
     EXPECT_EQ(string("--"), args[2]);
@@ -378,7 +378,7 @@ TEST(CephArgParse, env_to_vec) {
     args.push_back("--");
     setenv("CEPH_ARGS", "b -- c", 0);
     env_to_vec(args);
-    EXPECT_EQ(4, args.size());
+    EXPECT_EQ(4u, args.size());
     EXPECT_EQ(string("a"), args[0]);
     EXPECT_EQ(string("b"), args[1]);
     EXPECT_EQ(string("--"), args[2]);
@@ -391,7 +391,7 @@ TEST(CephArgParse, env_to_vec) {
     args.push_back("c");
     setenv("CEPH_ARGS", "b -- d", 0);
     env_to_vec(args);
-    EXPECT_EQ(4, args.size());
+    EXPECT_EQ(4u, args.size());
     EXPECT_EQ(string("b"), args[0]);
     EXPECT_EQ(string("--"), args[1]);
     EXPECT_EQ(string("c"), args[2]);
@@ -403,7 +403,7 @@ TEST(CephArgParse, env_to_vec) {
     args.push_back("b");
     setenv("CEPH_ARGS", "c -- d", 0);
     env_to_vec(args);
-    EXPECT_EQ(4, args.size());
+    EXPECT_EQ(4u, args.size());
     EXPECT_EQ(string("b"), args[0]);
     EXPECT_EQ(string("c"), args[1]);
     EXPECT_EQ(string("--"), args[2]);
@@ -417,7 +417,7 @@ TEST(CephArgParse, env_to_vec) {
     args.push_back("c");
     setenv("CEPH_ARGS", "-- d", 0);
     env_to_vec(args);
-    EXPECT_EQ(4, args.size());
+    EXPECT_EQ(4u, args.size());
     EXPECT_EQ(string("a"), args[0]);
     EXPECT_EQ(string("--"), args[1]);
     EXPECT_EQ(string("c"), args[2]);
@@ -431,7 +431,7 @@ TEST(CephArgParse, env_to_vec) {
     args.push_back("c");
     setenv("CEPH_ARGS", "d", 0);
     env_to_vec(args);
-    EXPECT_EQ(4, args.size());
+    EXPECT_EQ(4u, args.size());
     EXPECT_EQ(string("a"), args[0]);
     EXPECT_EQ(string("d"), args[1]);
     EXPECT_EQ(string("--"), args[2]);