Skip to content

Commit f8885e4

Browse files
committed
chore: upgrade gooletest deps
1 parent ffddd2c commit f8885e4

File tree

280 files changed

+33499
-42591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+33499
-42591
lines changed

bridge/third_party/googletest/BUILD.bazel

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,38 @@
3030
#
3131
# Bazel Build for Google C++ Testing Framework(Google Test)
3232

33-
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
34-
3533
package(default_visibility = ["//visibility:public"])
3634

3735
licenses(["notice"])
3836

37+
exports_files(["LICENSE"])
38+
39+
config_setting(
40+
name = "qnx",
41+
constraint_values = ["@platforms//os:qnx"],
42+
)
43+
3944
config_setting(
4045
name = "windows",
41-
constraint_values = ["@bazel_tools//platforms:windows"],
46+
constraint_values = ["@platforms//os:windows"],
47+
)
48+
49+
config_setting(
50+
name = "freebsd",
51+
constraint_values = ["@platforms//os:freebsd"],
52+
)
53+
54+
config_setting(
55+
name = "openbsd",
56+
constraint_values = ["@platforms//os:openbsd"],
57+
)
58+
59+
config_setting(
60+
name = "msvc_compiler",
61+
flag_values = {
62+
"@bazel_tools//tools/cpp:compiler": "msvc-cl",
63+
},
64+
visibility = [":__subpackages__"],
4265
)
4366

4467
config_setting(
@@ -76,6 +99,7 @@ cc_library(
7699
"googlemock/include/gmock/*.h",
77100
]),
78101
copts = select({
102+
":qnx": [],
79103
":windows": [],
80104
"//conditions:default": ["-pthread"],
81105
}),
@@ -94,17 +118,32 @@ cc_library(
94118
"googletest/include",
95119
],
96120
linkopts = select({
121+
":qnx": ["-lregex"],
97122
":windows": [],
123+
":freebsd": [
124+
"-lm",
125+
"-pthread",
126+
],
127+
":openbsd": [
128+
"-lm",
129+
"-pthread",
130+
],
98131
"//conditions:default": ["-pthread"],
99132
}),
100133
deps = select({
101134
":has_absl": [
102135
"@com_google_absl//absl/debugging:failure_signal_handler",
103136
"@com_google_absl//absl/debugging:stacktrace",
104137
"@com_google_absl//absl/debugging:symbolize",
138+
"@com_google_absl//absl/flags:flag",
139+
"@com_google_absl//absl/flags:parse",
140+
"@com_google_absl//absl/flags:reflection",
141+
"@com_google_absl//absl/flags:usage",
105142
"@com_google_absl//absl/strings",
143+
"@com_google_absl//absl/types:any",
106144
"@com_google_absl//absl/types:optional",
107145
"@com_google_absl//absl/types:variant",
146+
"@com_googlesource_code_re2//:re2",
108147
],
109148
"//conditions:default": [],
110149
}),

bridge/third_party/googletest/CMakeLists.txt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
# Note: CMake support is community-based. The maintainers do not use CMake
22
# internally.
33

4-
cmake_minimum_required(VERSION 2.8.8)
4+
cmake_minimum_required(VERSION 3.5)
55

66
if (POLICY CMP0048)
77
cmake_policy(SET CMP0048 NEW)
88
endif (POLICY CMP0048)
99

10+
if (POLICY CMP0077)
11+
cmake_policy(SET CMP0077 NEW)
12+
endif (POLICY CMP0077)
13+
1014
project(googletest-distribution)
11-
set(GOOGLETEST_VERSION 1.10.0)
15+
set(GOOGLETEST_VERSION 1.12.1)
1216

13-
if (CMAKE_VERSION VERSION_LESS "3.1")
14-
add_definitions(-std=c++11)
15-
else()
16-
set(CMAKE_CXX_STANDARD 11)
17-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
18-
if(NOT CYGWIN)
19-
set(CMAKE_CXX_EXTENSIONS OFF)
20-
endif()
17+
if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
18+
set(CMAKE_CXX_EXTENSIONS OFF)
2119
endif()
2220

2321
enable_testing()

bridge/third_party/googletest/CONTRIBUTING.md

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,23 @@ accept your pull requests.
2121

2222
## Are you a Googler?
2323

24-
If you are a Googler, please make an attempt to submit an internal change rather
25-
than a GitHub Pull Request. If you are not able to submit an internal change a
24+
If you are a Googler, please make an attempt to submit an internal contribution
25+
rather than a GitHub Pull Request. If you are not able to submit internally, a
2626
PR is acceptable as an alternative.
2727

2828
## Contributing A Patch
2929

3030
1. Submit an issue describing your proposed change to the
31-
[issue tracker](https://github.com/google/googletest).
31+
[issue tracker](https://github.com/google/googletest/issues).
3232
2. Please don't mix more than one logical change per submittal, because it
3333
makes the history hard to follow. If you want to make a change that doesn't
3434
have a corresponding issue in the issue tracker, please create one.
3535
3. Also, coordinate with team members that are listed on the issue in question.
3636
This ensures that work isn't being duplicated and communicating your plan
3737
early also generally leads to better patches.
3838
4. If your proposed change is accepted, and you haven't already done so, sign a
39-
Contributor License Agreement (see details above).
39+
Contributor License Agreement
40+
([see details above](#contributor-license-agreements)).
4041
5. Fork the desired repo, develop and test your code changes.
4142
6. Ensure that your code adheres to the existing style in the sample to which
4243
you are contributing.
@@ -80,7 +81,7 @@ fairly rigid coding style, as defined by the
8081
will be expected to conform to the style outlined
8182
[here](https://google.github.io/styleguide/cppguide.html). Use
8283
[.clang-format](https://github.com/google/googletest/blob/master/.clang-format)
83-
to check your formatting
84+
to check your formatting.
8485

8586
## Requirements for Contributors
8687

@@ -89,7 +90,7 @@ and their own tests from a git checkout, which has further requirements:
8990

9091
* [Python](https://www.python.org/) v2.3 or newer (for running some of the
9192
tests and re-generating certain source files from templates)
92-
* [CMake](https://cmake.org/) v2.6.4 or newer
93+
* [CMake](https://cmake.org/) v2.8.12 or newer
9394

9495
## Developing Google Test and Google Mock
9596

@@ -128,15 +129,3 @@ To run the tests, do
128129
make test
129130

130131
All tests should pass.
131-
132-
### Regenerating Source Files
133-
134-
Some of Google Test's source files are generated from templates (not in the C++
135-
sense) using a script. For example, the file
136-
include/gtest/internal/gtest-type-util.h.pump is used to generate
137-
gtest-type-util.h in the same directory.
138-
139-
You don't need to worry about regenerating the source files unless you need to
140-
modify them. You would then modify the corresponding `.pump` files and run the
141-
'[pump.py](googletest/scripts/pump.py)' generator script. See the
142-
[Pump Manual](googletest/docs/pump_manual.md).

bridge/third_party/googletest/googletest/CONTRIBUTORS renamed to bridge/third_party/googletest/CONTRIBUTORS

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,61 @@
55

66
Ajay Joshi <[email protected]>
77
Balázs Dán <[email protected]>
8+
Benoit Sigoure <[email protected]>
89
Bharat Mediratta <[email protected]>
10+
Bogdan Piloca <[email protected]>
911
Chandler Carruth <[email protected]>
1012
Chris Prince <[email protected]>
1113
Chris Taylor <[email protected]>
1214
Dan Egnor <[email protected]>
15+
Dave MacLachlan <[email protected]>
16+
David Anderson <[email protected]>
17+
Dean Sturtevant
1318
Eric Roman <[email protected]>
19+
Gene Volovich <[email protected]>
1420
Hady Zalek <[email protected]>
21+
Hal Burch <[email protected]>
1522
Jeffrey Yasskin <[email protected]>
23+
Jim Keller <[email protected]>
24+
Joe Walnes <[email protected]>
25+
1626
Jói Sigurðsson <[email protected]>
1727
Keir Mierle <[email protected]>
1828
Keith Ray <[email protected]>
1929
Kenton Varda <[email protected]>
30+
Kostya Serebryany <[email protected]>
31+
Krystian Kuzniarek <[email protected]>
32+
Lev Makhlis
2033
Manuel Klimek <[email protected]>
34+
Mario Tanev <[email protected]>
35+
Mark Paskin
2136
Markus Heule <[email protected]>
37+
Martijn Vels <[email protected]>
38+
Matthew Simmons <[email protected]>
2239
Mika Raento <[email protected]>
40+
Mike Bland <[email protected]>
2341
Miklós Fazekas <[email protected]>
42+
Neal Norwitz <[email protected]>
43+
Nermin Ozkiranartli <[email protected]>
44+
Owen Carlsen <[email protected]>
45+
Paneendra Ba <[email protected]>
2446
Pasi Valminen <[email protected]>
2547
Patrick Hanna <[email protected]>
2648
Patrick Riley <[email protected]>
49+
Paul Menage <[email protected]>
2750
Peter Kaminski <[email protected]>
51+
Piotr Kaminski <[email protected]>
2852
Preston Jackson <[email protected]>
2953
Rainer Klaffenboeck <[email protected]>
3054
3155
Russ Rufer <[email protected]>
3256
Sean Mcafee <[email protected]>
3357
Sigurður Ásgeirsson <[email protected]>
58+
Sverre Sundsdal <[email protected]>
59+
Szymon Sobik <[email protected]>
60+
Takeshi Yoshino <[email protected]>
3461
Tracy Bialik <[email protected]>
3562
Vadim Berman <[email protected]>
3663
Vlad Losev <[email protected]>
64+
Wolfgang Klier <[email protected]>
3765
Zhanyong Wan <[email protected]>

0 commit comments

Comments
 (0)