diff options
| author | Jordan Maples <jomaples@microsoft.com> | 2020-04-09 00:47:08 +0300 |
|---|---|---|
| committer | Jordan Maples <jomaples@microsoft.com> | 2020-04-09 00:47:08 +0300 |
| commit | 15dd17aa5b5cea90b2549d29ddf84a0e2be7a1f2 (patch) | |
| tree | e87caa8fbfc9cd1cc87ec7933965f9e1e2e5d7ae /tests | |
| parent | 01d206f4d8997a01741ffe8f6ba719a747b7e014 (diff) | |
| parent | 226a854a97087bbd9aa5ec2ccf94902b66037a72 (diff) | |
Merge branch 'master' into dev/jomaples/LWG3255
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/multi_span_tests.cpp | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1099fda..0219319 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -110,7 +110,14 @@ else() > > $<$<CXX_COMPILER_ID:Clang>: - $<$<CXX_COMPILER_VERSION:5.0.2>:-Wno-undefined-func-template> + $<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.99>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,6>>: + $<$<EQUAL:${GSL_CXX_STANDARD},17>:-Wno-undefined-func-template> + > + > + $<$<CXX_COMPILER_ID:AppleClang>: + $<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,9.1>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,10>>: + $<$<EQUAL:${GSL_CXX_STANDARD},17>:-Wno-undefined-func-template> + > > $<$<CXX_COMPILER_ID:GNU>: -Wdouble-promotion # float implicit to double diff --git a/tests/multi_span_tests.cpp b/tests/multi_span_tests.cpp index 6425928..d9a0e20 100644 --- a/tests/multi_span_tests.cpp +++ b/tests/multi_span_tests.cpp @@ -1042,7 +1042,10 @@ TEST(multi_span_test, subspan) EXPECT_TRUE(av.subspan(1).length() == 4); EXPECT_TRUE(av.subspan(4).length() == 1); EXPECT_TRUE(av.subspan(5).length() == 0); + // Disabled test instead of fixing since multi_span is deprecated. (PR#835) +#if !(defined(__GNUC__) && __GNUC__ == 8 && __GNUC_MINOR__ == 3) EXPECT_DEATH(av.subspan(6).length(), deathstring); +#endif auto av2 = av.subspan(1); for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2); } |