MSVC and CoreChecker warning suppression for tests to CMake

Suppress CppCoreCheck warnings on GTest macros. Suppress CppCoreCheck advice to use the GSL
2024-11-28 18:41:57 -05:00 · 2020-01-15 18:33:37 +01:00 · 2020-01-15 18:33:37 +01:00 · 81f56796a1
commit 81f56796a1
parent 4cbd894812
14 changed files with 17 additions and 92 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -45,6 +45,21 @@ if(MSVC) # MSVC or simulating MSVC
        /EHsc
        /W4
        /WX
+        $<$<CXX_COMPILER_ID:MSVC>:
+          /wd4996  # Use of function or classes marked [[deprecated]]
+          /wd26409 # CppCoreCheck - GTest
+          /wd26426 # CppCoreCheck - GTest
+          /wd26440 # CppCoreCheck - GTest
+          /wd26446 # CppCoreCheck - prefer gsl::at()
+          /wd26472 # CppCoreCheck - use gsl::narrow(_cast)
+          /wd26481 # CppCoreCheck - use span instead of pointer arithmetic
+          $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,1920>: # VS2015
+            /wd4189 # variable is initialized but not referenced
+            $<$<NOT:$<CONFIG:Debug>>: # Release, RelWithDebInfo
+              /wd4702 # Unreachable code
+            >
+          >
+        >
        $<$<CXX_COMPILER_ID:Clang>:
          -Weverything
          -Wno-c++98-compat
@ -172,6 +187,8 @@ if(MSVC) # MSVC or simulating MSVC
        $<$<CXX_COMPILER_ID:MSVC>:
          /wd4577
          /wd4702
+          /wd26440 # CppCoreCheck - GTest
+          /wd26446 # CppCoreCheck - prefer gsl::at()
        >
        $<$<CXX_COMPILER_ID:Clang>:
          -Weverything
--- a/tests/algorithm_tests.cpp
+++ b/tests/algorithm_tests.cpp
@ -14,12 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-#endif
-
 #include <gtest/gtest.h>
 #include <gsl/gsl_algorithm> // for copy
 #include <gsl/span>          // for span
--- a/tests/assertion_tests.cpp
+++ b/tests/assertion_tests.cpp
@ -14,12 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-#endif
-
 #include <gtest/gtest.h>
 #include <gsl/gsl_assert> // for fail_fast (ptr only), Ensures, Expects

--- a/tests/at_tests.cpp
+++ b/tests/at_tests.cpp
@ -14,12 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-#endif
-
 #include <gtest/gtest.h>

 #include <gsl/gsl_util> // for at
--- a/tests/bounds_tests.cpp
+++ b/tests/bounds_tests.cpp
@ -14,13 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-#pragma warning(disable : 4996)  // use of function or classes marked [[deprecated]]
-#endif
-
 #include <gtest/gtest.h>

 #include <gsl/multi_span> // for static_bounds, static_bounds_dynamic_range_t
--- a/tests/byte_tests.cpp
+++ b/tests/byte_tests.cpp
@ -14,12 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426)
-#endif // _MSC_VER
-
 #include <gtest/gtest.h>

 #include <gsl/gsl_byte> // for to_byte, to_integer, byte, operator&, ope...
--- a/tests/multi_span_tests.cpp
+++ b/tests/multi_span_tests.cpp
@ -14,14 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-#pragma warning(disable : 4996) // multi_span is in the process of being deprecated.
-                                // Suppressing warnings until it is completely removed
-#endif
-
 #include <gtest/gtest.h>

 #include <gsl/gsl_byte>   // for byte
--- a/tests/notnull_tests.cpp
+++ b/tests/notnull_tests.cpp
@ -14,15 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-
-// Fix VS2015 build breaks in Release
-#pragma warning(disable : 4702) // unreachable code
-#endif
-
 #include <gtest/gtest.h>

 #include <gsl/pointers> // for not_null, operator<, operator<=, operator>
--- a/tests/owner_tests.cpp
+++ b/tests/owner_tests.cpp
@ -14,13 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-
-#endif
-
 #include <gtest/gtest.h>

 #include <gsl/pointers> // for owner
--- a/tests/span_tests.cpp
+++ b/tests/span_tests.cpp
@ -14,12 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426 26497 4189 4996)
-#endif
-
 #include <gtest/gtest.h>

 #include <gsl/gsl_byte> // for byte
--- a/tests/strict_notnull_tests.cpp
+++ b/tests/strict_notnull_tests.cpp
@ -14,15 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-
-// Fix VS2015 build breaks in Release
-#pragma warning(disable : 4702) // unreachable code
-#endif
-
 #include <gtest/gtest.h>
 #include <gsl/pointers>           // for not_null, operator<, operator<=, operator>

--- a/tests/strided_span_tests.cpp
+++ b/tests/strided_span_tests.cpp
@ -14,14 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch deprecated
-#pragma warning(disable : 4996) // strided_span is in the process of being deprecated.
-                                // Suppressing warnings until it is completely removed
-#endif
-
 #include <gtest/gtest.h>
 #include <gsl/gsl_byte>   // for byte
 #include <gsl/gsl_util>   // for narrow_cast
--- a/tests/string_span_tests.cpp
+++ b/tests/string_span_tests.cpp
@ -14,13 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-
-#endif
-
 #include <gtest/gtest.h>

 #include <gsl/gsl_assert>  // for Expects, fail_fast (ptr only)
--- a/tests/utils_tests.cpp
+++ b/tests/utils_tests.cpp
@ -14,13 +14,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#ifdef _MSC_VER
-// blanket turn off warnings from CppCoreCheck from catch
-// so people aren't annoyed by them when running the tool.
-#pragma warning(disable : 26440 26426) // from catch
-
-#endif
-
 #include <gtest/gtest.h>

 #include <gsl/gsl_util> // for narrow, finally, narrow_cast, narrowing_e...