From 3445b42ff22b9540d0738a38bc8492fa066083f7 Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@google.com>
Date: Tue, 12 Dec 2023 13:45:57 +0100
Subject: [PATCH] disable dump_var_test sur mac; protobuf 25.0 -> 25.1

---
 Dependencies.txt                                       | 2 +-
 WORKSPACE                                              | 4 ++--
 cmake/dependencies/CMakeLists.txt                      | 4 ++--
 ortools/base/dump_vars_test.cc                         | 2 ++
 patches/{protobuf-v25.0.patch => protobuf-v25.1.patch} | 0
 5 files changed, 7 insertions(+), 5 deletions(-)
 rename patches/{protobuf-v25.0.patch => protobuf-v25.1.patch} (100%)

diff --git a/Dependencies.txt b/Dependencies.txt
index 7ac170bd21..7bcb97dcdc 100644
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -1,4 +1,4 @@
-Protobuf=v25.0
+Protobuf=v25.1
 abseil-cpp=20230802.1
 Cbc=2.10.7
 Cgl=0.60.5
diff --git a/WORKSPACE b/WORKSPACE
index 1169652b04..017569b108 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -103,8 +103,8 @@ git_repository(
 # This statement defines the @com_google_protobuf repo.
 git_repository(
     name = "com_google_protobuf",
-    tag = "v25.0",
-    patches = ["//patches:protobuf-v25.0.patch"],
+    tag = "v25.1",
+    patches = ["//patches:protobuf-v25.1.patch"],
     patch_args = ["-p1"],
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )
diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
index e2624fc18d..44f86568b2 100644
--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -103,9 +103,9 @@ if(BUILD_Protobuf)
   FetchContent_Declare(
     protobuf
     GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-    GIT_TAG "v25.0"
+    GIT_TAG "v25.1"
     GIT_SUBMODULES ""
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v25.0.patch")
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v25.1.patch")
   FetchContent_MakeAvailable(protobuf)
   list(POP_BACK CMAKE_MESSAGE_INDENT)
   message(CHECK_PASS "fetched")
diff --git a/ortools/base/dump_vars_test.cc b/ortools/base/dump_vars_test.cc
index 2f7525983e..1683d6aef7 100644
--- a/ortools/base/dump_vars_test.cc
+++ b/ortools/base/dump_vars_test.cc
@@ -36,6 +36,7 @@ TEST(DumpVars, Empty) {
   EXPECT_EQ(R"()", DUMP_VARS().str());
 }
 
+#if !defined(__APPLE__)
 TEST(DumpVars, Lvalue) {
   int a = 42;
   EXPECT_EQ(R"(a = 42)", ToString(DUMP_VARS(a)));
@@ -158,6 +159,7 @@ TEST(DumpVars, TemporaryLifetime) {
   EXPECT_EQ(R"(std::string_view(std::string("hello")) = hello)", ToString(v));
   EXPECT_EQ(R"(temp = hello)", ToString(v.as("temp")));
 }
+#endif  // !defined(__APPLE__)
 
 }  // namespace
 }  // namespace operations_research::base
diff --git a/patches/protobuf-v25.0.patch b/patches/protobuf-v25.1.patch
similarity index 100%
rename from patches/protobuf-v25.0.patch
rename to patches/protobuf-v25.1.patch