gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small code simplification (by Vlad Losev).

Browse Source
This commit is contained in:
zhanyong.wan
2009-09-16 17:36:39 +00:00
parent 866f4a9446
commit 302a41c90b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtest-death-test.cc
View File

@@ -269,12 +269,11 @@ static void FailFromInternalError(int fd) {
} while (num_read == -1 && errno == EINTR); } while (num_read == -1 && errno == EINTR);
if (num_read == 0) { if (num_read == 0) {
GTEST_LOG_(FATAL) << error.GetString().c_str(); GTEST_LOG_(FATAL) << error.GetString();
} else { } else {
const int last_error = errno; const int last_error = errno;
const String message = GetLastErrnoDescription();
GTEST_LOG_(FATAL) << "Error while reading death test internal: " GTEST_LOG_(FATAL) << "Error while reading death test internal: "
<< message.c_str() << " [" << last_error << "]"; << GetLastErrnoDescription() << " [" << last_error << "]";
} }
} }
@@ -402,7 +401,7 @@ void DeathTestImpl::ReadAndInterpretStatusByte() {
} }
} else { } else {
GTEST_LOG_(FATAL) << "Read from death test child process failed: " GTEST_LOG_(FATAL) << "Read from death test child process failed: "
<< GetLastErrnoDescription().c_str(); << GetLastErrnoDescription();
} }
GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd())); GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd()));
set_read_fd(-1); set_read_fd(-1);