Skip to content

Commit ad343ef

Browse files
authored
Merge pull request #21 from ament/clalancette/update-to-gtest-1.11
Update to gtest 1.11
2 parents 1c2fdcd + f709286 commit ad343ef

File tree

202 files changed

+18642
-22621
lines changed

Some content is hidden

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

202 files changed

+18642
-22621
lines changed
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: 'bug'
6+
assignees: ''
7+
---
8+
9+
**Describe the bug**
10+
11+
Include a clear and concise description of what the problem is, including what
12+
you expected to happen, and what actually happened.
13+
14+
**Steps to reproduce the bug**
15+
16+
It's important that we are able to reproduce the problem that you are
17+
experiencing. Please provide all code and relevant steps to reproduce the
18+
problem, including your `BUILD`/`CMakeLists.txt` file and build commands. Links
19+
to a GitHub branch or [godbolt.org](https://godbolt.org/) that demonstrate the
20+
problem are also helpful.
21+
22+
**Does the bug persist in the most recent commit?**
23+
24+
We recommend using the latest commit in the master branch in your projects.
25+
26+
**What operating system and version are you using?**
27+
28+
If you are using a Linux distribution please include the name and version of the
29+
distribution as well.
30+
31+
**What compiler and version are you using?**
32+
33+
Please include the output of `gcc -v` or `clang -v`, or the equivalent for your
34+
compiler.
35+
36+
**What build system are you using?**
37+
38+
Please include the output of `bazel --version` or `cmake --version`, or the
39+
equivalent for your build system.
40+
41+
**Additional context**
42+
43+
Add any other context about the problem here.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature request
3+
about: Propose a new feature
4+
title: ''
5+
labels: 'enhancement'
6+
assignees: ''
7+
---
8+
9+
**Does the feature exist in the most recent commit?**
10+
11+
We recommend using the latest commit from GitHub in your projects.
12+
13+
**Why do we need this feature?**
14+
15+
Ideally, explain why a combination of existing features cannot be used instead.
16+
17+
**Describe the proposal**
18+
19+
Include a detailed description of the feature, with usage examples.
20+
21+
**Is the feature specific to an operating system, compiler, or build system version?**
22+
23+
If it is, please specify which versions.
24+

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

.travis.yml

Lines changed: 0 additions & 73 deletions
This file was deleted.

BUILD.bazel.upstream

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,19 @@ package(default_visibility = ["//visibility:public"])
3636

3737
licenses(["notice"])
3838

39+
exports_files(["LICENSE"])
40+
3941
config_setting(
4042
name = "windows",
41-
constraint_values = ["@bazel_tools//platforms:windows"],
43+
constraint_values = ["@platforms//os:windows"],
44+
)
45+
46+
config_setting(
47+
name = "msvc_compiler",
48+
flag_values = {
49+
"@bazel_tools//tools/cpp:compiler": "msvc-cl",
50+
},
51+
visibility = [":__subpackages__"],
4252
)
4353

4454
config_setting(
@@ -103,6 +113,7 @@ cc_library(
103113
"@com_google_absl//absl/debugging:stacktrace",
104114
"@com_google_absl//absl/debugging:symbolize",
105115
"@com_google_absl//absl/strings",
116+
"@com_google_absl//absl/types:any",
106117
"@com_google_absl//absl/types:optional",
107118
"@com_google_absl//absl/types:variant",
108119
],

CMakeLists.txt.upstream

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
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 2.8.12)
55

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

1010
project(googletest-distribution)
11-
set(GOOGLETEST_VERSION 1.10.0)
11+
set(GOOGLETEST_VERSION 1.11.0)
1212

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)
13+
if (CMAKE_VERSION VERSION_GREATER "3.0.2")
14+
if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
1915
set(CMAKE_CXX_EXTENSIONS OFF)
2016
endif()
2117
endif()

CONTRIBUTING.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ PR is acceptable as an alternative.
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.
@@ -80,7 +80,7 @@ fairly rigid coding style, as defined by the
8080
will be expected to conform to the style outlined
8181
[here](https://google.github.io/styleguide/cppguide.html). Use
8282
[.clang-format](https://github.com/google/googletest/blob/master/.clang-format)
83-
to check your formatting
83+
to check your formatting.
8484

8585
## Requirements for Contributors
8686

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

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

9494
## Developing Google Test and Google Mock
9595

@@ -128,15 +128,3 @@ To run the tests, do
128128
make test
129129

130130
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).

googletest/CONTRIBUTORS renamed to CONTRIBUTORS

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

66
Ajay Joshi <jaj@google.com>
77
Balázs Dán <balazs.dan@gmail.com>
8+
Benoit Sigoure <tsuna@google.com>
89
Bharat Mediratta <bharat@menalto.com>
10+
Bogdan Piloca <boo@google.com>
911
Chandler Carruth <chandlerc@google.com>
1012
Chris Prince <cprince@google.com>
1113
Chris Taylor <taylorc@google.com>
1214
Dan Egnor <egnor@google.com>
15+
Dave MacLachlan <dmaclach@gmail.com>
16+
David Anderson <danderson@google.com>
17+
Dean Sturtevant
1318
Eric Roman <eroman@chromium.org>
19+
Gene Volovich <gv@cite.com>
1420
Hady Zalek <hady.zalek@gmail.com>
21+
Hal Burch <gmock@hburch.com>
1522
Jeffrey Yasskin <jyasskin@google.com>
23+
Jim Keller <jimkeller@google.com>
24+
Joe Walnes <joe@truemesh.com>
25+
Jon Wray <jwray@google.com>
1626
Jói Sigurðsson <joi@google.com>
1727
Keir Mierle <mierle@gmail.com>
1828
Keith Ray <keith.ray@gmail.com>
1929
Kenton Varda <kenton@google.com>
30+
Kostya Serebryany <kcc@google.com>
31+
Krystian Kuzniarek <krystian.kuzniarek@gmail.com>
32+
Lev Makhlis
2033
Manuel Klimek <klimek@google.com>
34+
Mario Tanev <radix@google.com>
35+
Mark Paskin
2136
Markus Heule <markus.heule@gmail.com>
37+
Matthew Simmons <simmonmt@acm.org>
2238
Mika Raento <mikie@iki.fi>
39+
Mike Bland <mbland@google.com>
2340
Miklós Fazekas <mfazekas@szemafor.com>
41+
Neal Norwitz <nnorwitz@gmail.com>
42+
Nermin Ozkiranartli <nermin@google.com>
43+
Owen Carlsen <ocarlsen@google.com>
44+
Paneendra Ba <paneendra@google.com>
2445
Pasi Valminen <pasi.valminen@gmail.com>
2546
Patrick Hanna <phanna@google.com>
2647
Patrick Riley <pfr@google.com>
48+
Paul Menage <menage@google.com>
2749
Peter Kaminski <piotrk@google.com>
50+
Piotr Kaminski <piotrk@google.com>
2851
Preston Jackson <preston.a.jackson@gmail.com>
2952
Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com>
3053
Russ Cox <rsc@google.com>
3154
Russ Rufer <russ@pentad.com>
3255
Sean Mcafee <eefacm@gmail.com>
3356
Sigurður Ásgeirsson <siggi@google.com>
57+
Sverre Sundsdal <sundsdal@gmail.com>
58+
Takeshi Yoshino <tyoshino@google.com>
3459
Tracy Bialik <tracy@pentad.com>
3560
Vadim Berman <vadimb@google.com>
3661
Vlad Losev <vladl@google.com>
62+
Wolfgang Klier <wklier@google.com>
3763
Zhanyong Wan <wan@google.com>

0 commit comments

Comments
 (0)