Skip to content

Commit 1621cda

Browse files
scheibelscheibel
committed
Update googletest dependency (closes #30)
1 parent a5e7840 commit 1621cda

File tree

339 files changed

+31816
-43068
lines changed

Some content is hidden

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

339 files changed

+31816
-43068
lines changed

‎source/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ set(gtest_disable_pthreads OFF CACHE BOOL "")
5252
set(gtest_force_shared_crt ON CACHE BOOL "")
5353
set(gtest_hide_internal_symbols OFF CACHE BOOL "")
5454

55-
add_subdirectory(googletest/googlemock)
55+
add_subdirectory(googletest)
5656

5757
# Create interface library to link against gmock
5858
add_library(gmock-dev INTERFACE)

‎source/tests/googletest/BUILD.bazel

+179
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
# Copyright 2017 Google Inc.
2+
# All Rights Reserved.
3+
#
4+
#
5+
# Redistribution and use in source and binary forms, with or without
6+
# modification, are permitted provided that the following conditions are
7+
# met:
8+
#
9+
# * Redistributions of source code must retain the above copyright
10+
# notice, this list of conditions and the following disclaimer.
11+
# * Redistributions in binary form must reproduce the above
12+
# copyright notice, this list of conditions and the following disclaimer
13+
# in the documentation and/or other materials provided with the
14+
# distribution.
15+
# * Neither the name of Google Inc. nor the names of its
16+
# contributors may be used to endorse or promote products derived from
17+
# this software without specific prior written permission.
18+
#
19+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23+
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25+
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+
#
31+
# Bazel Build for Google C++ Testing Framework(Google Test)
32+
33+
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
34+
35+
package(default_visibility = ["//visibility:public"])
36+
37+
licenses(["notice"])
38+
39+
config_setting(
40+
name = "windows",
41+
constraint_values = ["@bazel_tools//platforms:windows"],
42+
)
43+
44+
config_setting(
45+
name = "has_absl",
46+
values = {"define": "absl=1"},
47+
)
48+
49+
# Library that defines the FRIEND_TEST macro.
50+
cc_library(
51+
name = "gtest_prod",
52+
hdrs = ["googletest/include/gtest/gtest_prod.h"],
53+
includes = ["googletest/include"],
54+
)
55+
56+
# Google Test including Google Mock
57+
cc_library(
58+
name = "gtest",
59+
srcs = glob(
60+
include = [
61+
"googletest/src/*.cc",
62+
"googletest/src/*.h",
63+
"googletest/include/gtest/**/*.h",
64+
"googlemock/src/*.cc",
65+
"googlemock/include/gmock/**/*.h",
66+
],
67+
exclude = [
68+
"googletest/src/gtest-all.cc",
69+
"googletest/src/gtest_main.cc",
70+
"googlemock/src/gmock-all.cc",
71+
"googlemock/src/gmock_main.cc",
72+
],
73+
),
74+
hdrs = glob([
75+
"googletest/include/gtest/*.h",
76+
"googlemock/include/gmock/*.h",
77+
]),
78+
copts = select({
79+
":windows": [],
80+
"//conditions:default": ["-pthread"],
81+
}),
82+
defines = select({
83+
":has_absl": ["GTEST_HAS_ABSL=1"],
84+
"//conditions:default": [],
85+
}),
86+
features = select({
87+
":windows": ["windows_export_all_symbols"],
88+
"//conditions:default": [],
89+
}),
90+
includes = [
91+
"googlemock",
92+
"googlemock/include",
93+
"googletest",
94+
"googletest/include",
95+
],
96+
linkopts = select({
97+
":windows": [],
98+
"//conditions:default": ["-pthread"],
99+
}),
100+
deps = select({
101+
":has_absl": [
102+
"@com_google_absl//absl/debugging:failure_signal_handler",
103+
"@com_google_absl//absl/debugging:stacktrace",
104+
"@com_google_absl//absl/debugging:symbolize",
105+
"@com_google_absl//absl/strings",
106+
"@com_google_absl//absl/types:optional",
107+
"@com_google_absl//absl/types:variant",
108+
],
109+
"//conditions:default": [],
110+
}),
111+
)
112+
113+
cc_library(
114+
name = "gtest_main",
115+
srcs = ["googlemock/src/gmock_main.cc"],
116+
features = select({
117+
":windows": ["windows_export_all_symbols"],
118+
"//conditions:default": [],
119+
}),
120+
deps = [":gtest"],
121+
)
122+
123+
# The following rules build samples of how to use gTest.
124+
cc_library(
125+
name = "gtest_sample_lib",
126+
srcs = [
127+
"googletest/samples/sample1.cc",
128+
"googletest/samples/sample2.cc",
129+
"googletest/samples/sample4.cc",
130+
],
131+
hdrs = [
132+
"googletest/samples/prime_tables.h",
133+
"googletest/samples/sample1.h",
134+
"googletest/samples/sample2.h",
135+
"googletest/samples/sample3-inl.h",
136+
"googletest/samples/sample4.h",
137+
],
138+
features = select({
139+
":windows": ["windows_export_all_symbols"],
140+
"//conditions:default": [],
141+
}),
142+
)
143+
144+
cc_test(
145+
name = "gtest_samples",
146+
size = "small",
147+
# All Samples except:
148+
# sample9 (main)
149+
# sample10 (main and takes a command line option and needs to be separate)
150+
srcs = [
151+
"googletest/samples/sample1_unittest.cc",
152+
"googletest/samples/sample2_unittest.cc",
153+
"googletest/samples/sample3_unittest.cc",
154+
"googletest/samples/sample4_unittest.cc",
155+
"googletest/samples/sample5_unittest.cc",
156+
"googletest/samples/sample6_unittest.cc",
157+
"googletest/samples/sample7_unittest.cc",
158+
"googletest/samples/sample8_unittest.cc",
159+
],
160+
linkstatic = 0,
161+
deps = [
162+
"gtest_sample_lib",
163+
":gtest_main",
164+
],
165+
)
166+
167+
cc_test(
168+
name = "sample9_unittest",
169+
size = "small",
170+
srcs = ["googletest/samples/sample9_unittest.cc"],
171+
deps = [":gtest"],
172+
)
173+
174+
cc_test(
175+
name = "sample10_unittest",
176+
size = "small",
177+
srcs = ["googletest/samples/sample10_unittest.cc"],
178+
deps = [":gtest"],
179+
)

‎source/tests/googletest/CMakeLists.txt

+19-16
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
# Note: CMake support is community-based. The maintainers do not use CMake
2+
# internally.
3+
4+
cmake_minimum_required(VERSION 2.8.8)
25

36
if (POLICY CMP0048)
47
cmake_policy(SET CMP0048 NEW)
58
endif (POLICY CMP0048)
69

7-
project( googletest-distribution )
8-
9-
enable_testing()
10+
project(googletest-distribution)
11+
set(GOOGLETEST_VERSION 1.10.0)
1012

11-
include(CMakeDependentOption)
12-
if (CMAKE_VERSION VERSION_LESS 2.8.5)
13-
set(CMAKE_INSTALL_BINDIR "bin" CACHE STRING "User executables (bin)")
14-
set(CMAKE_INSTALL_LIBDIR "lib${LIB_SUFFIX}" CACHE STRING "Object code libraries (lib)")
15-
set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "C header files (include)")
16-
mark_as_advanced(CMAKE_INSTALL_BINDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR)
13+
if (CMAKE_VERSION VERSION_LESS "3.1")
14+
add_definitions(-std=c++11)
1715
else()
18-
include(GNUInstallDirs)
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()
1921
endif()
2022

21-
option(BUILD_GTEST "Builds the googletest subproject" OFF)
23+
enable_testing()
24+
25+
include(CMakeDependentOption)
26+
include(GNUInstallDirs)
2227

2328
#Note that googlemock target already builds googletest
2429
option(BUILD_GMOCK "Builds the googlemock subproject" ON)
25-
26-
cmake_dependent_option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON "BUILD_GTEST OR BUILD_GMOCK" OFF)
27-
cmake_dependent_option(INSTALL_GMOCK "Enable installation of googlemock. (Projects embedding googlemock may want to turn this OFF.)" ON "BUILD_GMOCK" OFF)
30+
option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
2831

2932
if(BUILD_GMOCK)
3033
add_subdirectory( googlemock )
31-
elseif(BUILD_GTEST)
34+
else()
3235
add_subdirectory( googletest )
3336
endif()

‎source/tests/googletest/CONTRIBUTING.md

+142
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
# How to become a contributor and submit your own code
2+
3+
## Contributor License Agreements
4+
5+
We'd love to accept your patches! Before we can take them, we have to jump a
6+
couple of legal hurdles.
7+
8+
Please fill out either the individual or corporate Contributor License Agreement
9+
(CLA).
10+
11+
* If you are an individual writing original source code and you're sure you
12+
own the intellectual property, then you'll need to sign an
13+
[individual CLA](https://developers.google.com/open-source/cla/individual).
14+
* If you work for a company that wants to allow you to contribute your work,
15+
then you'll need to sign a
16+
[corporate CLA](https://developers.google.com/open-source/cla/corporate).
17+
18+
Follow either of the two links above to access the appropriate CLA and
19+
instructions for how to sign and return it. Once we receive it, we'll be able to
20+
accept your pull requests.
21+
22+
## Are you a Googler?
23+
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
26+
PR is acceptable as an alternative.
27+
28+
## Contributing A Patch
29+
30+
1. Submit an issue describing your proposed change to the
31+
[issue tracker](https://github.com/google/googletest).
32+
2. Please don't mix more than one logical change per submittal, because it
33+
makes the history hard to follow. If you want to make a change that doesn't
34+
have a corresponding issue in the issue tracker, please create one.
35+
3. Also, coordinate with team members that are listed on the issue in question.
36+
This ensures that work isn't being duplicated and communicating your plan
37+
early also generally leads to better patches.
38+
4. If your proposed change is accepted, and you haven't already done so, sign a
39+
Contributor License Agreement (see details above).
40+
5. Fork the desired repo, develop and test your code changes.
41+
6. Ensure that your code adheres to the existing style in the sample to which
42+
you are contributing.
43+
7. Ensure that your code has an appropriate set of unit tests which all pass.
44+
8. Submit a pull request.
45+
46+
## The Google Test and Google Mock Communities
47+
48+
The Google Test community exists primarily through the
49+
[discussion group](http://groups.google.com/group/googletestframework) and the
50+
GitHub repository. Likewise, the Google Mock community exists primarily through
51+
their own [discussion group](http://groups.google.com/group/googlemock). You are
52+
definitely encouraged to contribute to the discussion and you can also help us
53+
to keep the effectiveness of the group high by following and promoting the
54+
guidelines listed here.
55+
56+
### Please Be Friendly
57+
58+
Showing courtesy and respect to others is a vital part of the Google culture,
59+
and we strongly encourage everyone participating in Google Test development to
60+
join us in accepting nothing less. Of course, being courteous is not the same as
61+
failing to constructively disagree with each other, but it does mean that we
62+
should be respectful of each other when enumerating the 42 technical reasons
63+
that a particular proposal may not be the best choice. There's never a reason to
64+
be antagonistic or dismissive toward anyone who is sincerely trying to
65+
contribute to a discussion.
66+
67+
Sure, C++ testing is serious business and all that, but it's also a lot of fun.
68+
Let's keep it that way. Let's strive to be one of the friendliest communities in
69+
all of open source.
70+
71+
As always, discuss Google Test in the official GoogleTest discussion group. You
72+
don't have to actually submit code in order to sign up. Your participation
73+
itself is a valuable contribution.
74+
75+
## Style
76+
77+
To keep the source consistent, readable, diffable and easy to merge, we use a
78+
fairly rigid coding style, as defined by the
79+
[google-styleguide](https://github.com/google/styleguide) project. All patches
80+
will be expected to conform to the style outlined
81+
[here](https://google.github.io/styleguide/cppguide.html). Use
82+
[.clang-format](https://github.com/google/googletest/blob/master/.clang-format)
83+
to check your formatting
84+
85+
## Requirements for Contributors
86+
87+
If you plan to contribute a patch, you need to build Google Test, Google Mock,
88+
and their own tests from a git checkout, which has further requirements:
89+
90+
* [Python](https://www.python.org/) v2.3 or newer (for running some of the
91+
tests and re-generating certain source files from templates)
92+
* [CMake](https://cmake.org/) v2.6.4 or newer
93+
94+
## Developing Google Test and Google Mock
95+
96+
This section discusses how to make your own changes to the Google Test project.
97+
98+
### Testing Google Test and Google Mock Themselves
99+
100+
To make sure your changes work as intended and don't break existing
101+
functionality, you'll want to compile and run Google Test and GoogleMock's own
102+
tests. For that you can use CMake:
103+
104+
mkdir mybuild
105+
cd mybuild
106+
cmake -Dgtest_build_tests=ON -Dgmock_build_tests=ON ${GTEST_REPO_DIR}
107+
108+
To choose between building only Google Test or Google Mock, you may modify your
109+
cmake command to be one of each
110+
111+
cmake -Dgtest_build_tests=ON ${GTEST_DIR} # sets up Google Test tests
112+
cmake -Dgmock_build_tests=ON ${GMOCK_DIR} # sets up Google Mock tests
113+
114+
Make sure you have Python installed, as some of Google Test's tests are written
115+
in Python. If the cmake command complains about not being able to find Python
116+
(`Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)`), try telling it
117+
explicitly where your Python executable can be found:
118+
119+
cmake -DPYTHON_EXECUTABLE=path/to/python ...
120+
121+
Next, you can build Google Test and / or Google Mock and all desired tests. On
122+
\*nix, this is usually done by
123+
124+
make
125+
126+
To run the tests, do
127+
128+
make test
129+
130+
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).

0 commit comments

Comments
 (0)