Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/GSL.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com>2019-12-10 03:08:27 +0300
committerJordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com>2019-12-10 03:08:27 +0300
commit078486660827209659c25bd41779672d450efd92 (patch)
tree225bf2cacea9ed89c5a9be8f6b37abeadf6d96d2 /tests/span_tests.cpp
parent9a8826254496085445c59249243c52c185271ce8 (diff)
added back death test, fixed VS2019 test failures
Diffstat (limited to 'tests/span_tests.cpp')
-rw-r--r--tests/span_tests.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp
index b2687ce..cdc2f72 100644
--- a/tests/span_tests.cpp
+++ b/tests/span_tests.cpp
@@ -17,7 +17,7 @@
#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) // from catch
+#pragma warning(disable : 26440 26426 26497 4189) // from catch
#endif
@@ -25,6 +25,7 @@
//disable warnings from gtest
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wundef"
+#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
#if __clang__
#pragma GCC diagnostic ignored "-Wglobal-constructors"
@@ -1217,14 +1218,14 @@ TEST(span_test, from_array_constructor)
auto beyond = s.rend();
EXPECT_TRUE(it != beyond);
- //EXPECT_DEATH(*beyond, ".*");
+ EXPECT_DEATH(auto _ = *beyond , ".*");
EXPECT_TRUE(beyond - first == 4);
EXPECT_TRUE(first - first == 0);
EXPECT_TRUE(beyond - beyond == 0);
++it;
- EXPECT_TRUE(it - first == 1);
+ EXPECT_TRUE(it - s.rbegin() == 1);
EXPECT_TRUE(*it == 3);
*it = 22;
EXPECT_TRUE(*it == 22);
@@ -1258,14 +1259,15 @@ TEST(span_test, from_array_constructor)
auto beyond = s.crend();
EXPECT_TRUE(it != beyond);
- //EXPECT_DEATH(*beyond, ".*");
+ EXPECT_DEATH(auto _ = *beyond, ".*");
EXPECT_TRUE(beyond - first == 4);
EXPECT_TRUE(first - first == 0);
EXPECT_TRUE(beyond - beyond == 0);
+ std::cout << *first << std::endl;
++it;
- EXPECT_TRUE(it - first == 1);
+ EXPECT_TRUE(it - s.crbegin() == 1);
EXPECT_TRUE(*it == 3);
EXPECT_TRUE(beyond - it == 3);