aboutsummaryrefslogtreecommitdiffstats
path: root/test/gmock-internal-utils_test.cc
diff options
context:
space:
mode:
authorvladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386>2010-05-05 19:47:46 +0000
committervladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386>2010-05-05 19:47:46 +0000
commit76c1c612e23d87874669faf0b1c8f74caa4a7eb4 (patch)
tree0ac4867c85a16bc63872782bc06e93e308c6482b /test/gmock-internal-utils_test.cc
parent54af9ba50a8ce03a4463faf45a61b47bdf79fefd (diff)
downloadgoogletest-76c1c612e23d87874669faf0b1c8f74caa4a7eb4.tar.gz
googletest-76c1c612e23d87874669faf0b1c8f74caa4a7eb4.tar.bz2
googletest-76c1c612e23d87874669faf0b1c8f74caa4a7eb4.zip
Fixes tests leaking altered values of GMOCK_FLAG(verbose) (issue 110).
Diffstat (limited to 'test/gmock-internal-utils_test.cc')
-rw-r--r--test/gmock-internal-utils_test.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc
index fc5d9e55..b8e05191 100644
--- a/test/gmock-internal-utils_test.cc
+++ b/test/gmock-internal-utils_test.cc
@@ -565,10 +565,12 @@ void TestLogWithSeverity(const string& verbosity, LogSeverity severity,
// Tests that when the stack_frames_to_skip parameter is negative,
// Log() doesn't include the stack trace in the output.
TEST(LogTest, NoStackTraceWhenStackFramesToSkipIsNegative) {
+ const string saved_flag = GMOCK_FLAG(verbose);
GMOCK_FLAG(verbose) = kInfoVerbosity;
CaptureStdout();
Log(INFO, "Test log.\n", -1);
EXPECT_STREQ("\nTest log.\n", GetCapturedStdout().c_str());
+ GMOCK_FLAG(verbose) = saved_flag;
}
// Tests that in opt mode, a positive stack_frames_to_skip argument is