Expect different representations of pointers from the Windows toolchain.

Abseil Team · copybara-github · commit 4eb1e49cf32a · 2025-05-02T07:59:39.000-07:00
In `TestPointerPrintedAsNumberDespiteAbslStringify`, an `EXPECT_DEATH` matches an error with a pointer represented in it. The representation used to differ for Windows. In newer releases, Windows' representation matches that of other toolchains.

This change makes either of the numeric representations admissible.

This change allows this test to pass before and after the latest Windows release.

PiperOrigin-RevId: 754003964
Change-Id: Ifee2c20a7d8022b380b7a58f50966013f7f7a4ba
diff --git a/absl/log/check_test_impl.inc b/absl/log/check_test_impl.inc
@@ -39,6 +39,7 @@
 namespace absl_log_internal {
 
 using ::testing::AllOf;
+using ::testing::AnyOf;
 using ::testing::HasSubstr;
 using ::testing::Not;
 
@@ -634,14 +635,12 @@ void AbslStringify(Sink& sink, const PointerIsStringifiable* var) {
 TEST(CHECKDeathTest, TestPointerPrintedAsNumberDespiteAbslStringify) {
   const auto* p = reinterpret_cast<const PointerIsStringifiable*>(0x1234);
 
-#ifdef _MSC_VER
   EXPECT_DEATH(
       ABSL_TEST_CHECK_EQ(p, nullptr),
-      HasSubstr("Check failed: p == nullptr (0000000000001234 vs. (null))"));
-#else   // _MSC_VER
-  EXPECT_DEATH(ABSL_TEST_CHECK_EQ(p, nullptr),
-               HasSubstr("Check failed: p == nullptr (0x1234 vs. (null))"));
-#endif  // _MSC_VER
+      AnyOf(
+        HasSubstr("Check failed: p == nullptr (0000000000001234 vs. (null))"),
+        HasSubstr("Check failed: p == nullptr (0x1234 vs. (null))")
+      ));
 }
 
 // An uncopyable object with operator<<.
