summaryrefslogtreecommitdiff
path: root/test/gtest-port_test.cc
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-08-07 06:47:47 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-08-07 06:47:47 +0000
commit535de5338c3a76bc75905694ac15731e3f0bfc8d (patch)
treeca41796e67c988e8985cc084e1c6136aa609df39 /test/gtest-port_test.cc
parent96ac1fd602a5d0c8c9c32c0d0bfd065cf73129e6 (diff)
downloadgoogletest-535de5338c3a76bc75905694ac15731e3f0bfc8d.tar.gz
Implements EXPECT_DEATH_IF_SUPPORTED (by Vlad Losev); Fixes compatibility with Symbian (by Araceli Checa); Removes GetCapturedStderr()'s dependency on std::string (by Vlad Losev).
git-svn-id: http://googletest.googlecode.com/svn/trunk@289 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test/gtest-port_test.cc')
-rw-r--r--test/gtest-port_test.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/test/gtest-port_test.cc b/test/gtest-port_test.cc
index 49af8b9..d980b7c 100644
--- a/test/gtest-port_test.cc
+++ b/test/gtest-port_test.cc
@@ -688,15 +688,11 @@ TEST(RETest, PartialMatchWorks) {
#endif // GTEST_USES_POSIX_RE
-#if GTEST_HAS_STD_STRING
-
TEST(CaptureStderrTest, CapturesStdErr) {
CaptureStderr();
fprintf(stderr, "abc");
- ASSERT_EQ("abc", GetCapturedStderr());
+ ASSERT_STREQ("abc", GetCapturedStderr().c_str());
}
-#endif // GTEST_HAS_STD_STRING
-
} // namespace internal
} // namespace testing