From 186f5d21c13c2b8dffa86ba5610afedfafebd13b Mon Sep 17 00:00:00 2001
From: Roelf-Jilling <r-j.wolthuis@live.com>
Date: Tue, 14 Jan 2020 17:09:27 +0100
Subject: [PATCH] Move compiler warning suppression for tests from cpp files to
 CMake

---
 tests/CMakeLists.txt           | 17 ++++++++++++++++-
 tests/algorithm_tests.cpp      | 17 -----------------
 tests/assertion_tests.cpp      | 17 -----------------
 tests/at_tests.cpp             | 17 -----------------
 tests/bounds_tests.cpp         | 19 -------------------
 tests/byte_tests.cpp           | 17 -----------------
 tests/multi_span_tests.cpp     | 19 -------------------
 tests/notnull_tests.cpp        | 17 -----------------
 tests/owner_tests.cpp          | 17 -----------------
 tests/span_tests.cpp           | 19 -------------------
 tests/strict_notnull_tests.cpp | 17 -----------------
 tests/strided_span_tests.cpp   | 18 ------------------
 tests/string_span_tests.cpp    | 17 -----------------
 tests/utils_tests.cpp          | 18 ------------------
 14 files changed, 16 insertions(+), 230 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5c93a9a..1d74c45 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -49,9 +49,16 @@ if(MSVC) # MSVC or simulating MSVC
           -Weverything
           -Wno-c++98-compat
           -Wno-c++98-compat-pedantic
+          -Wno-covered-switch-default # GTest
+          -Wno-deprecated-declarations # Allow tests for [[deprecated]] elements
+          -Wno-global-constructors # GTest
+          -Wno-language-extension-token # GTest gtest-port.h
           -Wno-missing-braces
           -Wno-missing-prototypes
-          -Wno-unknown-attributes
+          -Wno-shift-sign-overflow # GTest gtest-port.h
+          -Wno-undef # GTest
+          -Wno-unused-variable
+          -Wno-used-but-marked-unused # GTest EXPECT_DEATH
           $<$<EQUAL:${GSL_CXX_STANDARD},14>:-Wno-unused-member-function>
         >
     )
@@ -67,20 +74,28 @@ else()
         -Wpedantic
         -Wshadow
         -Wsign-conversion
+        -Wno-deprecated-declarations # Allow tests for [[deprecated]] elements
         $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:
           -Weverything
           -Wno-c++98-compat
           -Wno-c++98-compat-pedantic
           -Wno-missing-braces
+          -Wno-covered-switch-default # GTest
+          -Wno-global-constructors # GTest
           -Wno-missing-prototypes
           -Wno-padded
           -Wno-unknown-attributes
+          -Wno-unused-variable
+          -Wno-used-but-marked-unused # GTest EXPECT_DEATH
           $<$<EQUAL:${GSL_CXX_STANDARD},14>:-Wno-unused-member-function>
           -Wno-weak-vtables
         >
         $<$<CXX_COMPILER_ID:Clang>:
           $<$<CXX_COMPILER_VERSION:5.0.2>:-Wno-undefined-func-template>
         >
+        $<$<CXX_COMPILER_ID:GNU>:
+          -Wno-unused-variable
+        >
     )
 endif(MSVC)
 
diff --git a/tests/algorithm_tests.cpp b/tests/algorithm_tests.cpp
index 50bff11..cf6eb01 100644
--- a/tests/algorithm_tests.cpp
+++ b/tests/algorithm_tests.cpp
@@ -20,19 +20,6 @@
 #pragma warning(disable : 26440 26426) // from catch
 #endif
 
-#if __clang__ || __GNUC__
-// disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 #include <gsl/gsl_algorithm> // for copy
 #include <gsl/span>          // for span
@@ -244,7 +231,3 @@ TEST(algorithm_tests, small_destination_span)
     copy(src_span_static, dst_span_static);
 #endif
 }
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/assertion_tests.cpp b/tests/assertion_tests.cpp
index 598c7dc..da45128 100644
--- a/tests/assertion_tests.cpp
+++ b/tests/assertion_tests.cpp
@@ -20,19 +20,6 @@
 #pragma warning(disable : 26440 26426) // from catch
 #endif
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 #include <gsl/gsl_assert> // for fail_fast (ptr only), Ensures, Expects
 
@@ -78,7 +65,3 @@ TEST(assertion_tests, ensures)
     EXPECT_TRUE(g(2) == 3);
     EXPECT_DEATH(g(9), deathstring);
 }
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/at_tests.cpp b/tests/at_tests.cpp
index cbed5ba..370350c 100644
--- a/tests/at_tests.cpp
+++ b/tests/at_tests.cpp
@@ -20,19 +20,6 @@
 #pragma warning(disable : 26440 26426) // from catch
 #endif
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 
 #include <gsl/gsl_util> // for at
@@ -152,7 +139,3 @@ static constexpr bool test_constexpr()
 
 static_assert(test_constexpr(), "FAIL");
 #endif
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/bounds_tests.cpp b/tests/bounds_tests.cpp
index 4291ae1..d7fc33b 100644
--- a/tests/bounds_tests.cpp
+++ b/tests/bounds_tests.cpp
@@ -21,21 +21,6 @@
 #pragma warning(disable : 4996)  // use of function or classes marked [[deprecated]]
 #endif
 
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-//disable warnings from gtest
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 
 #include <gsl/multi_span> // for static_bounds, static_bounds_dynamic_range_t
@@ -122,7 +107,3 @@ TEST(bounds_tests, bounds_convertible)
 #ifdef CONFIRM_COMPILATION_ERRORS
 copy(src_span_static, dst_span_static);
 #endif
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/byte_tests.cpp b/tests/byte_tests.cpp
index ab243a7..45ba66d 100644
--- a/tests/byte_tests.cpp
+++ b/tests/byte_tests.cpp
@@ -20,19 +20,6 @@
 #pragma warning(disable : 26440 26426)
 #endif // _MSC_VER
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 
 #include <gsl/gsl_byte> // for to_byte, to_integer, byte, operator&, ope...
@@ -146,7 +133,3 @@ TEST(byte_tests, aliasing)
 #ifdef CONFIRM_COMPILATION_ERRORS
 copy(src_span_static, dst_span_static);
 #endif
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/multi_span_tests.cpp b/tests/multi_span_tests.cpp
index f2e040f..6940c28 100644
--- a/tests/multi_span_tests.cpp
+++ b/tests/multi_span_tests.cpp
@@ -22,21 +22,6 @@
                                 // Suppressing warnings until it is completely removed
 #endif
 
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-//disable warnings from gtest
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 
 #include <gsl/gsl_byte>   // for byte
@@ -1884,7 +1869,3 @@ TEST(multi_span_test, iterator)
 #ifdef CONFIRM_COMPILATION_ERRORS
 copy(src_span_static, dst_span_static);
 #endif
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/notnull_tests.cpp b/tests/notnull_tests.cpp
index 038119e..3e91cfd 100644
--- a/tests/notnull_tests.cpp
+++ b/tests/notnull_tests.cpp
@@ -23,19 +23,6 @@
 #pragma warning(disable : 4702) // unreachable code
 #endif
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 
 #include <gsl/pointers> // for not_null, operator<, operator<=, operator>
@@ -558,7 +545,3 @@ TEST(notnull_tests, TestMakeNotNull)
 
 static_assert(std::is_nothrow_move_constructible<not_null<void*>>::value,
               "not_null must be no-throw move constructible");
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/owner_tests.cpp b/tests/owner_tests.cpp
index 8756596..16134e8 100644
--- a/tests/owner_tests.cpp
+++ b/tests/owner_tests.cpp
@@ -21,19 +21,6 @@
 
 #endif
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 
 #include <gsl/pointers> // for owner
@@ -61,7 +48,3 @@ TEST(owner_tests, check_pointer_constraint)
     }
     #endif
 }
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp
index 28c97f5..d0da49d 100644
--- a/tests/span_tests.cpp
+++ b/tests/span_tests.cpp
@@ -20,21 +20,6 @@
 #pragma warning(disable : 26440 26426 26497 4189 4996)
 #endif
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 
 #include <gsl/gsl_byte> // for byte
@@ -1698,7 +1683,3 @@ TEST(span_test, from_array_constructor)
     EXPECT_DEATH(s2.front(), deathstring);
     EXPECT_DEATH(s2.back(), deathstring);
  }
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/strict_notnull_tests.cpp b/tests/strict_notnull_tests.cpp
index 3c971db..f06542b 100644
--- a/tests/strict_notnull_tests.cpp
+++ b/tests/strict_notnull_tests.cpp
@@ -23,19 +23,6 @@
 #pragma warning(disable : 4702) // unreachable code
 #endif
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 #include <gsl/pointers>           // for not_null, operator<, operator<=, operator>
 
@@ -213,7 +200,3 @@ TEST(strict_notnull_tests, TestStrictNotNullConstructorTypeDeduction)
 
 static_assert(std::is_nothrow_move_constructible<strict_not_null<void*>>::value,
               "strict_not_null must be no-throw move constructible");
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/strided_span_tests.cpp b/tests/strided_span_tests.cpp
index f5f3704..2773ac1 100644
--- a/tests/strided_span_tests.cpp
+++ b/tests/strided_span_tests.cpp
@@ -22,20 +22,6 @@
                                 // Suppressing warnings until it is completely removed
 #endif
 
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-//disable warnings from gtest
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 #include <gsl/gsl_byte>   // for byte
 #include <gsl/gsl_util>   // for narrow_cast
@@ -810,7 +796,3 @@ TEST(strided_span_tests, strided_span_conversion)
         i++;
     }
 }
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/string_span_tests.cpp b/tests/string_span_tests.cpp
index 24bf140..0e90b85 100644
--- a/tests/string_span_tests.cpp
+++ b/tests/string_span_tests.cpp
@@ -21,19 +21,6 @@
 
 #endif
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
 #include <gtest/gtest.h>
 
 #include <gsl/gsl_assert>  // for Expects, fail_fast (ptr only)
@@ -1235,7 +1222,3 @@ TEST(string_span_tests, as_writeable_bytes)
     EXPECT_TRUE(static_cast<const void*>(bs.data()) == static_cast<const void*>(s.data()));
     EXPECT_TRUE(bs.size() == s.size_bytes());
 }
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__
diff --git a/tests/utils_tests.cpp b/tests/utils_tests.cpp
index db6e8c5..54f2882 100644
--- a/tests/utils_tests.cpp
+++ b/tests/utils_tests.cpp
@@ -21,20 +21,6 @@
 
 #endif
 
-#if __clang__ || __GNUC__
-//disable warnings from gtest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
-#endif // __clang__ || __GNUC__
-
-#if __clang__
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#pragma GCC diagnostic ignored "-Wused-but-marked-unused"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif // __clang__
-
-
 #include <gtest/gtest.h>
 
 #include <gsl/gsl_util> // for narrow, finally, narrow_cast, narrowing_e...
@@ -154,7 +140,3 @@ TEST(utils_tests, narrow)
 #endif
 
 }
-
-#if __clang__ || __GNUC__
-#pragma GCC diagnostic pop
-#endif // __clang__ || __GNUC__