Export of internal Abseil changes

--
6ac972ce1a042a8925c20cb8b76897b018990de4 by Abseil Team <absl-team@google.com>:

Improve failure reports in signal handler test.

PiperOrigin-RevId: 278377121
GitOrigin-RevId: 6ac972ce1a042a8925c20cb8b76897b018990de4
Change-Id: I74c8cd5c633f2dc77d533556184071a9af6e2768
This commit is contained in:
Abseil Team 2019-11-04 07:46:04 -08:00 committed by Xiaoyi Zhang
parent 846e5dbeda
commit 20de2db748

View file

@ -23,6 +23,7 @@
#include <fstream> #include <fstream>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gmock/gmock.h"
#include "absl/base/internal/raw_logging.h" #include "absl/base/internal/raw_logging.h"
#include "absl/debugging/stacktrace.h" #include "absl/debugging/stacktrace.h"
#include "absl/debugging/symbolize.h" #include "absl/debugging/symbolize.h"
@ -31,6 +32,8 @@
namespace { namespace {
using testing::StartsWith;
#if GTEST_HAS_DEATH_TEST #if GTEST_HAS_DEATH_TEST
// For the parameterized death tests. GetParam() returns the signal number. // For the parameterized death tests. GetParam() returns the signal number.
@ -113,15 +116,15 @@ TEST_P(FailureSignalHandlerDeathTest, AbslFatalSignalsWithWriterFn) {
ASSERT_TRUE(error_output.is_open()) << file; ASSERT_TRUE(error_output.is_open()) << file;
std::string error_line; std::string error_line;
std::getline(error_output, error_line); std::getline(error_output, error_line);
EXPECT_TRUE(absl::StartsWith( EXPECT_THAT(
error_line, error_line,
absl::StrCat("*** ", StartsWith(absl::StrCat(
absl::debugging_internal::FailureSignalToString(signo), "*** ", absl::debugging_internal::FailureSignalToString(signo),
" received at "))); " received at ")));
if (absl::debugging_internal::StackTraceWorksForTest()) { if (absl::debugging_internal::StackTraceWorksForTest()) {
std::getline(error_output, error_line); std::getline(error_output, error_line);
EXPECT_TRUE(absl::StartsWith(error_line, "PC: ")); EXPECT_THAT(error_line, StartsWith("PC: "));
} }
} }