summaryrefslogtreecommitdiffstats
path: root/googletest/src/gtest-death-test.cc
diff options
context:
space:
mode:
authorShaindel Schwartz <shaindel@google.com>2019-09-12 16:10:51 (GMT)
committerShaindel Schwartz <shaindel@google.com>2019-09-12 16:10:51 (GMT)
commitc7a03daa99e7c457561b5dd2afc0eddab166e48e (patch)
treeef122e5c8d5e0c5239a29f1a56012445f59cb867 /googletest/src/gtest-death-test.cc
parentac24edd6e06114818b1a29c99bb81153514f7fb2 (diff)
parent7bd4a7f3e9ae46bb7d99fc5fd5dd1a137496bb6a (diff)
downloadgoogletest-c7a03daa99e7c457561b5dd2afc0eddab166e48e.zip
googletest-c7a03daa99e7c457561b5dd2afc0eddab166e48e.tar.gz
googletest-c7a03daa99e7c457561b5dd2afc0eddab166e48e.tar.bz2
Merge pull request #2387 from kuzkry:iff
PiperOrigin-RevId: 268693457
Diffstat (limited to 'googletest/src/gtest-death-test.cc')
-rw-r--r--googletest/src/gtest-death-test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index e5ec287..da09a1c 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -122,8 +122,8 @@ GTEST_DEFINE_string_(
"Indicates the file, line number, temporal index of "
"the single death test to run, and a file descriptor to "
"which a success code may be sent, all separated by "
- "the '|' characters. This flag is specified if and only if the current "
- "process is a sub-process launched for running a thread-safe "
+ "the '|' characters. This flag is specified if and only if the "
+ "current process is a sub-process launched for running a thread-safe "
"death test. FOR INTERNAL USE ONLY.");
} // namespace internal
@@ -563,8 +563,8 @@ static ::std::string FormatDeathTestOutput(const ::std::string& output) {
// status_ok: true if exit_status is acceptable in the context of
// this particular death test, which fails if it is false
//
-// Returns true if all of the above conditions are met. Otherwise, the
-// first failing condition, in the order given above, is the one that is
+// Returns true if and only if all of the above conditions are met. Otherwise,
+// the first failing condition, in the order given above, is the one that is
// reported. Also sets the last death test message string.
bool DeathTestImpl::Passed(bool status_ok) {
if (!spawned())