summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-07-24 19:07:10 +0000
committerkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-07-24 19:07:10 +0000
commitb7be629c0b272ff2b12d560ac3c92bcd9845106d (patch)
treebe2453958d84033ca83486358e0e0784c6f928a8 /test
parentd778c261a2488fb17cf048892fd490361e6fddd2 (diff)
downloadgoogletest-b7be629c0b272ff2b12d560ac3c92bcd9845106d.tar.gz
Inject implementation of *FromGTestEnv using macros.
git-svn-id: http://googletest.googlecode.com/svn/trunk@734 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
-rw-r--r--test/gtest_unittest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc
index dd7f19f..60aed35 100644
--- a/test/gtest_unittest.cc
+++ b/test/gtest_unittest.cc
@@ -1671,6 +1671,8 @@ TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenVariableIsNotSet) {
EXPECT_EQ(10, Int32FromGTestEnv("temp", 10));
}
+# if !defined(GTEST_GET_INT32_FROM_ENV_)
+
// Tests that Int32FromGTestEnv() returns the default value when the
// environment variable overflows as an Int32.
TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueOverflows) {
@@ -1695,6 +1697,8 @@ TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueIsInvalid) {
EXPECT_EQ(50, Int32FromGTestEnv("temp", 50));
}
+# endif // !defined(GTEST_GET_INT32_FROM_ENV_)
+
// Tests that Int32FromGTestEnv() parses and returns the value of the
// environment variable when it represents a valid decimal integer in
// the range of an Int32.