tests: enable sign compare

Change-Id: Ib316109ef38617df9ce7bcc2851354cdf14e192a

Author: jeremy-lunarg

tests/CMakeLists.txt

@@ -26,7 +26,7 @@ if(WIN32)
     endif()
 
 else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 endif()
 
 set (LIBGLM_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/libs)

tests/gtest-1.7.0/include/gtest/gtest.h

@@ -1445,12 +1445,21 @@ AssertionResult CmpHelperEQ(const char* expected_expression,
                                 // signed/unsigned mismatch.
 #endif
 
+#if defined(__GNUC__) || defined(__GNUG__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#endif
+
   if (expected == actual) {
     return AssertionSuccess();
   }
 
 #ifdef _MSC_VER
 # pragma warning(pop)          // Restores the warning state.
+#endif
+
+#if defined(__GNUC__) || defined(__GNUG__)
+#pragma GCC diagnostic pop
 #endif
 
   return EqFailure(expected_expression,

tests/vktestframework.cpp

@@ -598,7 +598,7 @@ char **VkTestFramework::ReadFileData(const char *fileName) {
 #endif
 
     char *fdata;
-    int count = 0;
+    size_t count = 0;
     const int maxSourceStrings = 5;
     char **return_data =
         (char **)malloc(sizeof(char *) * (maxSourceStrings + 1));
@@ -631,8 +631,8 @@ char **VkTestFramework::ReadFileData(const char *fileName) {
     } else
         m_num_shader_strings = 1;
 
-    int len = (int)(ceil)((float)count / (float)m_num_shader_strings);
-    int ptr_len = 0, i = 0;
+    size_t len = (int)(ceil)((float)count / (float)m_num_shader_strings);
+    size_t ptr_len = 0, i = 0;
     while (count > 0) {
         return_data[i] = (char *)malloc(len + 2);
         memcpy(return_data[i], fdata + ptr_len, len);