Merge pull request #77 from paxos1977/Issue76

pjohnmeyer · pjohnmeyer · commit dab64862c4e1 · 2015-09-21T22:54:39.000-05:00
Disable tests in TestTestMacros.cpp which throw exceptions from destructors
diff --git a/tests/TestTestMacros.cpp b/tests/TestTestMacros.cpp
@@ -136,6 +136,11 @@ TEST(FixturesWithThrowingCtorsAreFailures)
 	CHECK(strstr(reporter.lastFailedMessage, "while constructing fixture"));
 }
 
+// Visual Studio 2015 in compliance with C++11 standard
+// implicitly adds a 'noexcept' to all user defined 
+// destructors. Any exceptions thrown from destructors
+// cause abort() to be called on the process.
+#if(_MSC_VER < 1900)
 struct FixtureDtorThrows
 {
 	~FixtureDtorThrows() { throw "exception"; }
@@ -161,6 +166,7 @@ TEST(FixturesWithThrowingDtorsAreFailures)
 	CHECK_EQUAL(1, failureCount);
 	CHECK(strstr(reporter.lastFailedMessage, "while destroying fixture"));
 }
+#endif 
 
 const int FailingLine = 123;
 

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,11 @@ TEST(FixturesWithThrowingCtorsAreFailures)`
`136`	`136`	`CHECK(strstr(reporter.lastFailedMessage, "while constructing fixture"));`
`137`	`137`	`}`
`138`	`138`
	`139`	`+// Visual Studio 2015 in compliance with C++11 standard`
	`140`	`+// implicitly adds a 'noexcept' to all user defined`
	`141`	`+// destructors. Any exceptions thrown from destructors`
	`142`	`+// cause abort() to be called on the process.`
	`143`	`+#if(_MSC_VER < 1900)`
`139`	`144`	`struct FixtureDtorThrows`
`140`	`145`	`{`
`141`	`146`	`~FixtureDtorThrows() { throw "exception"; }`
`@@ -161,6 +166,7 @@ TEST(FixturesWithThrowingDtorsAreFailures)`
`161`	`166`	`CHECK_EQUAL(1, failureCount);`
`162`	`167`	`CHECK(strstr(reporter.lastFailedMessage, "while destroying fixture"));`
`163`	`168`	`}`
	`169`	`+#endif`
`164`	`170`
`165`	`171`	`const int FailingLine = 123;`
`166`	`172`