summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2014-01-29 07:29:19 +0000
committerkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2014-01-29 07:29:19 +0000
commitcc0116f14aa8ad9ab76226d082a96b1005221816 (patch)
treeb604cd1d242d6f9cd70b2640c3f7dc4ea1783bdb /test
parentf841fdc9c03f36a227321280720260a03e754f35 (diff)
downloadgoogletest-cc0116f14aa8ad9ab76226d082a96b1005221816.tar.gz
Suppress "Conditional expression is constant" warning on Visual Studio.
git-svn-id: http://googletest.googlecode.com/svn/trunk@677 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
-rw-r--r--test/gtest_premature_exit_test.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/gtest_premature_exit_test.cc b/test/gtest_premature_exit_test.cc
index f6b6be9..fcfc623 100644
--- a/test/gtest_premature_exit_test.cc
+++ b/test/gtest_premature_exit_test.cc
@@ -100,7 +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_
if (kTestPrematureExitFileEnvVarShouldBeSet) {
+ GTEST_INTENTIONAL_CONST_COND_POP_
const char* const filepath = GetEnv("TEST_PREMATURE_EXIT_FILE");
ASSERT_TRUE(filepath != NULL);
ASSERT_NE(*filepath, '\0');