Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[googletest] Version bump v1.13 #1173

Merged
merged 2 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions depends/common/googletest/0001-FixWarningMaybe-uninitialized.patch

This file was deleted.

24 changes: 24 additions & 0 deletions depends/common/googletest/0001-fix-UWP-death-test.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 10493e3854db0c4709f9ddd1ac10b974d30219f5 Mon Sep 17 00:00:00 2001
From: Sergey <[email protected]>
Date: Tue, 21 Feb 2023 13:29:20 -0700
Subject: [PATCH] Fix error in_death_test_child_process: undeclared identifier

The error occurs if !GTEST_HAS_DEATH_TEST on Windows.
---
googletest/src/gtest.cc | 3 +++
1 file changed, 3 insertions(+)

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index a60a042cc5..dd7752cf19 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -5416,6 +5416,9 @@ int UnitTest::Run() {
impl()->set_catch_exceptions(GTEST_FLAG_GET(catch_exceptions));

#if GTEST_OS_WINDOWS
+#if !GTEST_HAS_DEATH_TEST
+ const bool in_death_test_child_process = false;
+#endif
// Either the user wants Google Test to catch exceptions thrown by the
// tests or this is executing in the context of death test child
// process. In either case the user does not want to see pop-up dialogs
16 changes: 12 additions & 4 deletions depends/common/googletest/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
# Note: CMake support is community-based. The maintainers do not use CMake
# internally.

cmake_minimum_required(VERSION 2.8.8)
cmake_minimum_required(VERSION 3.5)

if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
endif (POLICY CMP0048)

if (POLICY CMP0069)
cmake_policy(SET CMP0069 NEW)
endif (POLICY CMP0069)

if (POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif (POLICY CMP0077)

project(googletest-distribution)
set(GOOGLETEST_VERSION 1.10.0)
set(GOOGLETEST_VERSION 1.13.0)

if (CMAKE_VERSION VERSION_LESS "3.1")
add_definitions(-std=c++11)
add_definitions(-std=c++14)
else()
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT CYGWIN)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down
2 changes: 1 addition & 1 deletion depends/common/googletest/googletest.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363
2 changes: 1 addition & 1 deletion depends/common/googletest/googletest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
googletest http://mirrors.kodi.tv/build-deps/sources/googletest-1.10.0.tar.gz
googletest https://mirrors.kodi.tv/build-deps/sources/googletest-1.13.0.tar.gz