commit 2550cee067c1a4c0d9c594700040be1b1da1c721
author crgeddes <crgeddes@us.ibm.com> Tue May 05 17:51:28 2020 +0000
committer crgeddes <crgeddes@us.ibm.com> Wed May 06 19:27:23 2020 +0000
tree 6ff7acd6dda81f4ccb7379d459f9870c7fbd10e8
parent 6b1d1ca47a7e8cfe16e2b1b8a8dad51a30975d14

Update GTEST EXPECT_EQ macros so they compile with latest gcc

Ubuntu 18.04's latest c++ has gcc 7.5 which was failing w/ signed
vs unsigned comparison in the EXPECT_EQ test cases. This commit
addresses this problem by adding the 'u' to literals that should
be treated by the compiler as unsigned values.

Signed-off-by: crgeddes <crgeddes@us.ibm.com>
Change-Id: I62b93fe0191dd592ec8bb81b9ca09de8b68fa185

libpldm/tests/libpldm_utils_test.cpp

diff --git a/libpldm/tests/libpldm_utils_test.cpp b/libpldm/tests/libpldm_utils_test.cpp
index 990a62b..1b178d7 100644
--- a/libpldm/tests/libpldm_utils_test.cpp
+++ b/libpldm/tests/libpldm_utils_test.cpp
@@ -25,25 +25,25 @@
     const char* vstr = "3.7.10a";
     char buffer[1024];
     auto rc = ver2str(&version, buffer, sizeof(buffer));
-    EXPECT_EQ(rc, std::strlen(vstr));
+    EXPECT_EQ(rc, (signed)std::strlen(vstr));
     EXPECT_STREQ(vstr, buffer);
 
     version = {0x10, 0x01, 0xf7, 0x00};
     vstr = "10.01.7";
     rc = ver2str(&version, buffer, sizeof(buffer));
-    EXPECT_EQ(rc, std::strlen(vstr));
+    EXPECT_EQ(rc, (signed)std::strlen(vstr));
     EXPECT_STREQ(vstr, buffer);
 
     version = {0xf3, 0xf1, 0xff, 0x00};
     vstr = "3.1";
     rc = ver2str(&version, buffer, sizeof(buffer));
-    EXPECT_EQ(rc, std::strlen(vstr));
+    EXPECT_EQ(rc, (signed)std::strlen(vstr));
     EXPECT_STREQ(vstr, buffer);
 
     version = {0xf1, 0xf0, 0xff, 0x61};
     vstr = "1.0a";
     rc = ver2str(&version, buffer, sizeof(buffer));
-    EXPECT_EQ(rc, std::strlen(vstr));
+    EXPECT_EQ(rc, (signed)std::strlen(vstr));
     EXPECT_STREQ(vstr, buffer);
 
     rc = ver2str(&version, buffer, 3);
@@ -59,19 +59,19 @@
 
 TEST(BcdConversion, BcdCoversion)
 {
-    EXPECT_EQ(12, bcd2dec8(0x12));
-    EXPECT_EQ(99, bcd2dec8(0x99));
-    EXPECT_EQ(1234, bcd2dec16(0x1234));
-    EXPECT_EQ(9999, bcd2dec16(0x9999));
-    EXPECT_EQ(12345678, bcd2dec32(0x12345678));
-    EXPECT_EQ(99999999, bcd2dec32(0x99999999));
+    EXPECT_EQ(12u, bcd2dec8(0x12));
+    EXPECT_EQ(99u, bcd2dec8(0x99));
+    EXPECT_EQ(1234u, bcd2dec16(0x1234));
+    EXPECT_EQ(9999u, bcd2dec16(0x9999));
+    EXPECT_EQ(12345678u, bcd2dec32(0x12345678));
+    EXPECT_EQ(99999999u, bcd2dec32(0x99999999));
 
-    EXPECT_EQ(0x12, dec2bcd8(12));
-    EXPECT_EQ(0x99, dec2bcd8(99));
-    EXPECT_EQ(0x1234, dec2bcd16(1234));
-    EXPECT_EQ(0x9999, dec2bcd16(9999));
-    EXPECT_EQ(0x12345678, dec2bcd32(12345678));
-    EXPECT_EQ(0x99999999, dec2bcd32(99999999));
+    EXPECT_EQ(0x12u, dec2bcd8(12));
+    EXPECT_EQ(0x99u, dec2bcd8(99));
+    EXPECT_EQ(0x1234u, dec2bcd16(1234));
+    EXPECT_EQ(0x9999u, dec2bcd16(9999));
+    EXPECT_EQ(0x12345678u, dec2bcd32(12345678));
+    EXPECT_EQ(0x99999999u, dec2bcd32(99999999));
 }
 
 TEST(TimeLegal, TimeLegal)
@@ -87,4 +87,4 @@
     EXPECT_EQ(false, is_time_legal(30, 25, 25, 18, 8, 2019));  // hours illegal
     EXPECT_EQ(false, is_time_legal(30, 70, 16, 18, 8, 2019)); // minutes illegal
     EXPECT_EQ(false, is_time_legal(80, 25, 16, 18, 8, 2019)); // seconds illegal
-}
\ No newline at end of file
+}