PS4 build death test fix

Author: Bret Ambrose

aws-cpp-sdk-s3-encryption-tests/CryptoModulesTest.cpp

@@ -52,10 +52,10 @@ namespace
     static size_t const CBC_IV_SIZE_BYTES = 16u;
 
 #ifndef ENABLE_COMMONCRYPTO_ENCRYPTION
-#if !defined(NDEBUG) && !defined(GTEST_PSEUDO_WINDOWS)
+#if !defined(NDEBUG) && defined(GTEST_HAS_DEATH_TEST)
     static const char* const BYTES_SPECIFIER = "bytes=0-10";
     static const char* const ASSERTION_FAILED = "Assertion .*";
-#endif // !defined(NDEBUG) && !defined(GTEST_PSEUDO_WINDOWS)
+#endif // !defined(NDEBUG) && defined(GTEST_HAS_DEATH_TEST)
     static const char* const GET_RANGE_SPECIFIER = "bytes=20-40";
     static const char* const GET_RANGE_OUTPUT = "ge for encryption and";
     static size_t const GCM_TAG_LENGTH = 128u;
@@ -714,7 +714,7 @@ namespace
         ASSERT_EQ(kmsClient->m_decryptCalledCount, 1u);
     }
 
-#if !defined(NDEBUG) && !defined(GTEST_PSEUDO_WINDOWS)
+#if !defined(NDEBUG) && defined(GTEST_HAS_DEATH_TEST)
     TEST_F(CryptoModulesTest, StrictAERangeGet)
     {
         SimpleEncryptionMaterials materials(Aws::Utils::Crypto::SymmetricCipher::GenerateKey());
@@ -829,7 +829,7 @@ namespace
         auto getObjectFunction = [&s3Client](Aws::S3::Model::GetObjectRequest getRequest) -> Aws::S3::Model::GetObjectOutcome { return s3Client.GetObject(getRequest); };
         ASSERT_DEATH({ decryptionModule->GetObjectSecurely(getRequest, headOutcome.GetResult(), contentCryptoMaterial, getObjectFunction); }, ASSERTION_FAILED);
     }
-#endif // !defined(NDEBUG) && !defined(GTEST_PSEUDO_WINDOWS)
+#endif // !defined(NDEBUG) && defined(GTEST_HAS_DEATH_TEST)
 #endif
 
     TEST_F(CryptoModulesTest, RangeParserSuccess)

testing-resources/include/aws/external/gtest.h

@@ -1755,11 +1755,12 @@ using ::std::tuple_size;
 // Google Test does not support death tests for VC 7.1 and earlier as
 // abort() in a VC 7.1 application compiled as GUI in debug config
 // pops up a dialog window that cannot be suppressed programmatically.
-#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
+#if ((GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
      (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \
-     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400 && !defined(GTEST_PSEUDO_WINDOWS)) || \
+     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
      GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
-     GTEST_OS_OPENBSD || GTEST_OS_QNX)
+     GTEST_OS_OPENBSD || GTEST_OS_QNX) && \
+     !defined(GTEST_DISABLE_DEATH_TESTS))
 # define GTEST_HAS_DEATH_TEST 1
 # include <vector>  // NOLINT
 #endif