aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_debug_stack__trace__unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_debug_stack__trace__unittest.cc')
-rw-r--r--www/chromium/files/patch-base_debug_stack__trace__unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc
index 933a8e8ce401..bdbdb57fe408 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc
@@ -1,14 +1,14 @@
---- base/debug/stack_trace_unittest.cc.orig 2020-03-23 14:01:09 UTC
+--- base/debug/stack_trace_unittest.cc.orig 2020-11-13 06:36:34 UTC
+++ base/debug/stack_trace_unittest.cc
-@@ -86,6 +86,7 @@ TEST_F(StackTraceTest, OutputToStream) {
+@@ -88,6 +88,7 @@ TEST_F(StackTraceTest, OutputToStream) {
std::string::npos)
<< "Unable to resolve symbols.";
+#if !defined(OS_BSD)
// Expect a demangled symbol.
// Note that Windows Release builds omit the function parameters from the
- // demangled stack output, otherwise this could be "testing::Test::Run()".
-@@ -103,9 +104,10 @@ TEST_F(StackTraceTest, OutputToStream) {
+ // demangled stack output, otherwise this could be "testing::UnitTest::Run()".
+@@ -106,9 +107,10 @@ TEST_F(StackTraceTest, OutputToStream) {
EXPECT_TRUE(backtrace_message.find(__func__) != std::string::npos)
<< "Expected to find " << __func__ << " in backtrace:\n"
<< backtrace_message;
@@ -20,7 +20,7 @@
// Disabled in Official builds, where Link-Time Optimization can result in two
// or fewer stack frames being available, causing the test to fail.
TEST_F(StackTraceTest, TruncatedTrace) {
-@@ -119,7 +121,7 @@ TEST_F(StackTraceTest, TruncatedTrace) {
+@@ -122,7 +124,7 @@ TEST_F(StackTraceTest, TruncatedTrace) {
truncated.Addresses(&count);
EXPECT_EQ(2u, count);
}