diff options
Diffstat (limited to 'absl/log')
| -rw-r--r-- | absl/log/internal/test_helpers.cc | 2 | ||||
| -rw-r--r-- | absl/log/log_modifier_methods_test.cc | 6 | ||||
| -rw-r--r-- | absl/log/stripping_test.cc | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/absl/log/internal/test_helpers.cc b/absl/log/internal/test_helpers.cc index bfcc9679..0f5640bb 100644 --- a/absl/log/internal/test_helpers.cc +++ b/absl/log/internal/test_helpers.cc @@ -18,6 +18,8 @@ #include <zircon/syscalls.h> #endif +#include <signal.h> + #include "gtest/gtest.h" #include "absl/base/config.h" #include "absl/base/log_severity.h" diff --git a/absl/log/log_modifier_methods_test.cc b/absl/log/log_modifier_methods_test.cc index 4ccde404..9b6a7ec8 100644 --- a/absl/log/log_modifier_methods_test.cc +++ b/absl/log/log_modifier_methods_test.cc @@ -180,7 +180,8 @@ TEST(TailCallsModifiesTest, WithPerror) { test_sink, Send(AllOf(TextMessage(AnyOf(Eq("hello world: Bad file number [9]"), Eq("hello world: Bad file descriptor [9]"), - Eq("hello world: Bad file descriptor [8]"))), + Eq("hello world: Bad file descriptor [8]"), + Eq("hello world: Bad file descriptor [1073741833]"))), ENCODED_MESSAGE(HasValues(ElementsAre( EqualsProto(R"pb(literal: "hello world")pb"), EqualsProto(R"pb(literal: ": ")pb"), @@ -188,7 +189,8 @@ TEST(TailCallsModifiesTest, WithPerror) { EqualsProto(R"pb(str: "Bad file descriptor")pb")), EqualsProto(R"pb(literal: " [")pb"), AnyOf(EqualsProto(R"pb(str: "8")pb"), - EqualsProto(R"pb(str: "9")pb")), + EqualsProto(R"pb(str: "9")pb"), + EqualsProto(R"pb(str: "1073741833")pb")), EqualsProto(R"pb(literal: "]")pb"))))))); test_sink.StartCapturingLogs(); diff --git a/absl/log/stripping_test.cc b/absl/log/stripping_test.cc index 271fae1d..20231b9f 100644 --- a/absl/log/stripping_test.cc +++ b/absl/log/stripping_test.cc @@ -33,7 +33,7 @@ #include <stdio.h> -#if defined(__MACH__) +#if defined(__APPLE__) #include <mach-o/dyld.h> #elif defined(_WIN32) #include <Windows.h> @@ -191,7 +191,7 @@ class StrippingTest : public ::testing::Test { absl::FPrintF(stderr, "Failed to open /pkg/bin/<binary name>: %s\n", err); } return fp; -#elif defined(__MACH__) +#elif defined(__APPLE__) uint32_t size = 0; int ret = _NSGetExecutablePath(nullptr, &size); if (ret != -1) { |