From cc99900036ae3514d8918acba87817fa24f6c993 Mon Sep 17 00:00:00 2001
From: Maurice Gilden <Maurice.Gilden@teamviewer.com>
Date: Fri, 18 Aug 2017 11:46:15 +0200
Subject: [PATCH] Fix test if exceptions are not supported

---
 googlemock/test/gmock-nice-strict_test.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/googlemock/test/gmock-nice-strict_test.cc b/googlemock/test/gmock-nice-strict_test.cc
index 5e6d53be..86706814 100644
--- a/googlemock/test/gmock-nice-strict_test.cc
+++ b/googlemock/test/gmock-nice-strict_test.cc
@@ -213,6 +213,7 @@ TEST(NiceMockTest, AllowsExpectedCall) {
 // the method.
 TEST(NiceMockTest, ThrowsExceptionForUnknownReturnTypes) {
 	NiceMock<MockFoo> nice_foo;
+#if GTEST_HAS_EXCEPTIONS
 	try	{
 		nice_foo.ReturnSomething();
 		FAIL();
@@ -220,6 +221,11 @@ TEST(NiceMockTest, ThrowsExceptionForUnknownReturnTypes) {
 		const std::string exception_msg(ex.what());
 		EXPECT_NE(exception_msg.find("ReturnSomething"), std::string::npos);
 	}
+#else
+	EXPECT_DEATH_IF_SUPPORTED({
+		nice_foo.ReturnSomething();
+	}, "");
+#endif
 }
 
 // Tests that an unexpected call on a nice mock fails.