diff options
author | billydonahue@google.com <billydonahue@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-05-15 19:42:15 +0000 |
---|---|---|
committer | billydonahue@google.com <billydonahue@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-05-15 19:42:15 +0000 |
commit | f0d7f455d0ba1b1da1891c3ee54961a162e8fbc4 (patch) | |
tree | c7d7f91871f2078acc77b8b41dd5dd8313765a24 /test/gtest_premature_exit_test.cc | |
parent | e735d74bc537869af877dfc90c171dc140495c11 (diff) | |
download | googletest-f0d7f455d0ba1b1da1891c3ee54961a162e8fbc4.tar.gz |
Push upstream to SVN.
git-svn-id: http://googletest.googlecode.com/svn/trunk@686 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test/gtest_premature_exit_test.cc')
-rw-r--r-- | test/gtest_premature_exit_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gtest_premature_exit_test.cc b/test/gtest_premature_exit_test.cc index fcfc623..c1ed968 100644 --- a/test/gtest_premature_exit_test.cc +++ b/test/gtest_premature_exit_test.cc @@ -100,9 +100,9 @@ TEST_F(PrematureExitDeathTest, FileExistsDuringExecutionOfDeathTest) { // Tests that TEST_PREMATURE_EXIT_FILE is set where it's expected to // be set. TEST_F(PrematureExitTest, TestPrematureExitFileEnvVarIsSet) { - GTEST_INTENTIONAL_CONST_COND_PUSH_ + GTEST_INTENTIONAL_CONST_COND_PUSH_() if (kTestPrematureExitFileEnvVarShouldBeSet) { - GTEST_INTENTIONAL_CONST_COND_POP_ + GTEST_INTENTIONAL_CONST_COND_POP_() const char* const filepath = GetEnv("TEST_PREMATURE_EXIT_FILE"); ASSERT_TRUE(filepath != NULL); ASSERT_NE(*filepath, '\0'); |