Commit 302a41c9 by zhanyong.wan

Small code simplification (by Vlad Losev).

parent 866f4a94
...@@ -269,12 +269,11 @@ static void FailFromInternalError(int fd) { ...@@ -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() { ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment