From ce1d3484756e20ce96f6404eb62362c87fbd584a Mon Sep 17 00:00:00 2001 From: Andy Getzendanner Date: Fri, 4 Nov 2022 14:12:33 -0700 Subject: Narrow some _MSC_VER checks to not catch clang-cl. PiperOrigin-RevId: 486227733 Change-Id: If492d715e5758971cf7bd0ccd748b47b1424a3c7 --- absl/log/log_format_test.cc | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'absl/log/log_format_test.cc') diff --git a/absl/log/log_format_test.cc b/absl/log/log_format_test.cc index 397c8d0c..f88650fe 100644 --- a/absl/log/log_format_test.cc +++ b/absl/log/log_format_test.cc @@ -648,13 +648,15 @@ TYPED_TEST(VoidPtrLogFormatTest, NonNull) { auto comparison_stream = ComparisonStream(); comparison_stream << value; - EXPECT_CALL(test_sink, - Send(AllOf(TextMessage(MatchesOstream(comparison_stream)), - TextMessage(AnyOf(Eq("0xdeadbeef"), Eq("DEADBEEF"), - Eq("00000000DEADBEEF"))), - ENCODED_MESSAGE(EqualsProto(R"pb(value { - str: "0xdeadbeef" - })pb"))))); + EXPECT_CALL( + test_sink, + Send(AllOf( + TextMessage(MatchesOstream(comparison_stream)), + TextMessage( + AnyOf(Eq("0xdeadbeef"), Eq("DEADBEEF"), Eq("00000000DEADBEEF"))), + ENCODED_MESSAGE(AnyOf( + EqualsProto(R"pb(value { str: "0xdeadbeef" })pb"), + EqualsProto(R"pb(value { str: "00000000DEADBEEF" })pb")))))); test_sink.StartCapturingLogs(); LOG(INFO) << value; @@ -1286,8 +1288,11 @@ TEST(ManipulatorLogFormatTest, FixedAndScientificFloat) { Send(AllOf(TextMessage(MatchesOstream(comparison_stream)), TextMessage(AnyOf(Eq("0x1.25bb50p+26"), Eq("0x1.25bb5p+26"), Eq("0x1.25bb500000000p+26"))), - ENCODED_MESSAGE(EqualsProto(R"pb( - value { str: "0x1.25bb5p+26" })pb"))))); + ENCODED_MESSAGE( + AnyOf(EqualsProto(R"pb(value { str: "0x1.25bb5p+26" })pb"), + EqualsProto(R"pb(value { + str: "0x1.25bb500000000p+26" + })pb")))))); test_sink.StartCapturingLogs(); @@ -1316,8 +1321,11 @@ TEST(ManipulatorLogFormatTest, HexfloatFloat) { Send(AllOf(TextMessage(MatchesOstream(comparison_stream)), TextMessage(AnyOf(Eq("0x1.25bb50p+26"), Eq("0x1.25bb5p+26"), Eq("0x1.25bb500000000p+26"))), - ENCODED_MESSAGE(EqualsProto(R"pb( - value { str: "0x1.25bb5p+26" })pb"))))); + ENCODED_MESSAGE( + AnyOf(EqualsProto(R"pb(value { str: "0x1.25bb5p+26" })pb"), + EqualsProto(R"pb(value { + str: "0x1.25bb500000000p+26" + })pb")))))); test_sink.StartCapturingLogs(); LOG(INFO) << std::hexfloat << value; -- cgit v1.2.3