Skip to content

Commit 1f7490b

Browse files
committed
Imported upstream version '1.15.1' of 'upstream'
1 parent ce1377a commit 1f7490b

File tree

296 files changed

+37848
-45264
lines changed

Some content is hidden

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

296 files changed

+37848
-45264
lines changed
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Bug Report
2+
description: Let us know that something does not work as expected.
3+
title: "[Bug]: Please title this bug report"
4+
body:
5+
- type: textarea
6+
id: what-happened
7+
attributes:
8+
label: Describe the issue
9+
description: What happened, and what did you expect to happen?
10+
validations:
11+
required: true
12+
- type: textarea
13+
id: steps
14+
attributes:
15+
label: Steps to reproduce the problem
16+
description: It is important that we are able to reproduce the problem that you are experiencing. Please provide all code and relevant steps to reproduce the problem, including your `BUILD`/`CMakeLists.txt` file and build commands. Links to a GitHub branch or [godbolt.org](https://godbolt.org/) that demonstrate the problem are also helpful.
17+
validations:
18+
required: true
19+
- type: textarea
20+
id: version
21+
attributes:
22+
label: What version of GoogleTest are you using?
23+
description: Please include the output of `git rev-parse HEAD` or the GoogleTest release version number that you are using.
24+
validations:
25+
required: true
26+
- type: textarea
27+
id: os
28+
attributes:
29+
label: What operating system and version are you using?
30+
description: If you are using a Linux distribution please include the name and version of the distribution as well.
31+
validations:
32+
required: true
33+
- type: textarea
34+
id: compiler
35+
attributes:
36+
label: What compiler and version are you using?
37+
description: Please include the output of `gcc -v` or `clang -v`, or the equivalent for your compiler.
38+
validations:
39+
required: true
40+
- type: textarea
41+
id: buildsystem
42+
attributes:
43+
label: What build system are you using?
44+
description: Please include the output of `bazel --version` or `cmake --version`, or the equivalent for your build system.
45+
validations:
46+
required: true
47+
- type: textarea
48+
id: additional
49+
attributes:
50+
label: Additional context
51+
description: Add any other context about the problem here.
52+
validations:
53+
required: false
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Feature request
2+
description: Propose a new feature.
3+
title: "[FR]: Please title this feature request"
4+
labels: "enhancement"
5+
body:
6+
- type: textarea
7+
id: version
8+
attributes:
9+
label: Does the feature exist in the most recent commit?
10+
description: We recommend using the latest commit from GitHub in your projects.
11+
validations:
12+
required: true
13+
- type: textarea
14+
id: why
15+
attributes:
16+
label: Why do we need this feature?
17+
description: Ideally, explain why a combination of existing features cannot be used instead.
18+
validations:
19+
required: true
20+
- type: textarea
21+
id: proposal
22+
attributes:
23+
label: Describe the proposal.
24+
description: Include a detailed description of the feature, with usage examples.
25+
validations:
26+
required: true
27+
- type: textarea
28+
id: platform
29+
attributes:
30+
label: Is the feature specific to an operating system, compiler, or build system version?
31+
description: If it is, please specify which versions.
32+
validations:
33+
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Get Help
4+
url: https://github.com/google/googletest/discussions
5+
about: Please ask and answer questions here.

.github/workflows/gtest-ci.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: ci
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
env:
8+
BAZEL_CXXOPTS: -std=c++14
9+
10+
jobs:
11+
Linux:
12+
runs-on: ubuntu-latest
13+
steps:
14+
15+
- uses: actions/checkout@v3
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Tests
20+
run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ...
21+
22+
macOS:
23+
runs-on: macos-latest
24+
steps:
25+
26+
- uses: actions/checkout@v3
27+
with:
28+
fetch-depth: 0
29+
30+
- name: Tests
31+
run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ...
32+
33+
34+
Windows:
35+
runs-on: windows-latest
36+
steps:
37+
38+
- uses: actions/checkout@v3
39+
with:
40+
fetch-depth: 0
41+
42+
- name: Tests
43+
run: bazel test --cxxopt=/std:c++14 --features=external_include_paths --test_output=errors ...

.travis.yml

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

BUILD.bazel.upstream

Lines changed: 43 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,33 @@ 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": [
135+
"@com_google_absl//absl/container:flat_hash_set",
102136
"@com_google_absl//absl/debugging:failure_signal_handler",
103137
"@com_google_absl//absl/debugging:stacktrace",
104138
"@com_google_absl//absl/debugging:symbolize",
139+
"@com_google_absl//absl/flags:flag",
140+
"@com_google_absl//absl/flags:parse",
141+
"@com_google_absl//absl/flags:reflection",
142+
"@com_google_absl//absl/flags:usage",
105143
"@com_google_absl//absl/strings",
144+
"@com_google_absl//absl/types:any",
106145
"@com_google_absl//absl/types:optional",
107146
"@com_google_absl//absl/types:variant",
147+
"@com_googlesource_code_re2//:re2",
108148
],
109149
"//conditions:default": [],
110150
}),

CMakeLists.txt.upstream

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

4-
cmake_minimum_required(VERSION 2.8.8)
5-
6-
if (POLICY CMP0048)
7-
cmake_policy(SET CMP0048 NEW)
8-
endif (POLICY CMP0048)
4+
cmake_minimum_required(VERSION 3.13)
95

106
project(googletest-distribution)
11-
set(GOOGLETEST_VERSION 1.10.0)
7+
set(GOOGLETEST_VERSION 1.14.0)
128

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()
9+
if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
10+
set(CMAKE_CXX_EXTENSIONS OFF)
2111
endif()
2212

2313
enable_testing()
@@ -28,6 +18,7 @@ include(GNUInstallDirs)
2818
#Note that googlemock target already builds googletest
2919
option(BUILD_GMOCK "Builds the googlemock subproject" ON)
3020
option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
21+
option(GTEST_HAS_ABSL "Use Abseil and RE2. Requires Abseil and RE2 to be separately added to the build." OFF)
3122

3223
if(BUILD_GMOCK)
3324
add_subdirectory( googlemock )

0 commit comments

Comments
 (0)