disable dump_var_test sur mac; protobuf 25.0 -> 25.1

This commit is contained in:
Laurent Perron
2023-12-12 13:45:57 +01:00
parent 7b730ad5bd
commit 3445b42ff2
5 changed files with 7 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
Protobuf=v25.0
Protobuf=v25.1
abseil-cpp=20230802.1
Cbc=2.10.7
Cgl=0.60.5

View File

@@ -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",
)

View File

@@ -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")

View File

@@ -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