Skip to content

Commit fb7f24b

Browse files
committed
googletest
1 parent 1c8ec05 commit fb7f24b

File tree

234 files changed

+12840
-28406
lines changed

Some content is hidden

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

234 files changed

+12840
-28406
lines changed

3rd/googletest/.gitignore

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ googletest/m4/ltoptions.m4
3535
googletest/m4/ltsugar.m4
3636
googletest/m4/ltversion.m4
3737
googletest/m4/lt~obsolete.m4
38+
googlemock/m4
3839

3940
# Ignore generated directories.
4041
googlemock/fused-src/
@@ -55,3 +56,29 @@ googlemock/CTestTestfile.cmake
5556
googlemock/Makefile
5657
googlemock/cmake_install.cmake
5758
googlemock/gtest
59+
/bin
60+
/googlemock/gmock.dir
61+
/googlemock/gmock_main.dir
62+
/googlemock/RUN_TESTS.vcxproj.filters
63+
/googlemock/RUN_TESTS.vcxproj
64+
/googlemock/INSTALL.vcxproj.filters
65+
/googlemock/INSTALL.vcxproj
66+
/googlemock/gmock_main.vcxproj.filters
67+
/googlemock/gmock_main.vcxproj
68+
/googlemock/gmock.vcxproj.filters
69+
/googlemock/gmock.vcxproj
70+
/googlemock/gmock.sln
71+
/googlemock/ALL_BUILD.vcxproj.filters
72+
/googlemock/ALL_BUILD.vcxproj
73+
/lib
74+
/Win32
75+
/ZERO_CHECK.vcxproj.filters
76+
/ZERO_CHECK.vcxproj
77+
/RUN_TESTS.vcxproj.filters
78+
/RUN_TESTS.vcxproj
79+
/INSTALL.vcxproj.filters
80+
/INSTALL.vcxproj
81+
/googletest-distribution.sln
82+
/CMakeCache.txt
83+
/ALL_BUILD.vcxproj.filters
84+
/ALL_BUILD.vcxproj

3rd/googletest/.travis.yml

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,41 @@
33
# This file can be validated on:
44
# http://lint.travis-ci.org/
55

6-
sudo: false
76
language: cpp
87

98
# Define the matrix explicitly, manually expanding the combinations of (os, compiler, env).
109
# It is more tedious, but grants us far more flexibility.
1110
matrix:
1211
include:
1312
- os: linux
14-
dist: trusty
15-
sudo: required
16-
group: deprecated-2017Q3
17-
before_install: chmod -R +x ./ci/*platformio.sh
13+
before_install: chmod -R +x ./ci/*platformio.sh
1814
install: ./ci/install-platformio.sh
19-
script: ./ci/build-platformio.sh
15+
script: ./ci/build-platformio.sh
2016
- os: linux
17+
dist: xenial
2118
compiler: gcc
22-
sudo : true
2319
install: ./ci/install-linux.sh && ./ci/log-config.sh
2420
script: ./ci/build-linux-bazel.sh
2521
- os: linux
22+
dist: xenial
2623
compiler: clang
27-
sudo : true
2824
install: ./ci/install-linux.sh && ./ci/log-config.sh
2925
script: ./ci/build-linux-bazel.sh
3026
- os: linux
31-
group: deprecated-2017Q4
32-
compiler: gcc
33-
install: ./ci/install-linux.sh && ./ci/log-config.sh
34-
script: ./ci/build-linux-autotools.sh
35-
env: VERBOSE=1 CXXFLAGS=-std=c++11
36-
- os: linux
37-
group: deprecated-2017Q4
3827
compiler: gcc
3928
env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11
4029
- os: linux
41-
group: deprecated-2017Q4
4230
compiler: clang
43-
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
31+
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 -Wgnu-zero-variadic-macro-arguments
4432
- os: linux
4533
compiler: clang
4634
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
4735
- os: osx
4836
compiler: gcc
49-
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
37+
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
5038
- os: osx
51-
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
52-
if: type != pull_request
39+
compiler: clang
40+
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
5341

5442
# These are the install and build (script) phases for the most common entries in the matrix. They could be included
5543
# in each entry in the matrix, but that is just repetitive.
@@ -60,7 +48,7 @@ install:
6048

6149
script: ./ci/travis.sh
6250

63-
# For sudo=false builds this section installs the necessary dependencies.
51+
# This section installs the necessary dependencies.
6452
addons:
6553
apt:
6654
# List of whitelisted in travis packages for ubuntu-precise can be found here:
@@ -73,6 +61,13 @@ addons:
7361
packages:
7462
- g++-4.9
7563
- clang-3.9
64+
update: true
65+
homebrew:
66+
packages:
67+
- ccache
68+
69+
- llvm@4
70+
update: true
7671

7772
notifications:
7873
email: false

3rd/googletest/BUILD.bazel

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
#
31-
# Author: [email protected] (Gennadiy Civil)
32-
#
3331
# Bazel Build for Google C++ Testing Framework(Google Test)
3432

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

3737
licenses(["notice"])
@@ -83,6 +83,10 @@ cc_library(
8383
":has_absl": ["GTEST_HAS_ABSL=1"],
8484
"//conditions:default": [],
8585
}),
86+
features = select({
87+
":windows": ["windows_export_all_symbols"],
88+
"//conditions:default": [],
89+
}),
8690
includes = [
8791
"googlemock",
8892
"googlemock/include",
@@ -109,6 +113,10 @@ cc_library(
109113
cc_library(
110114
name = "gtest_main",
111115
srcs = ["googlemock/src/gmock_main.cc"],
116+
features = select({
117+
":windows": ["windows_export_all_symbols"],
118+
"//conditions:default": [],
119+
}),
112120
deps = [":gtest"],
113121
)
114122

@@ -127,6 +135,10 @@ cc_library(
127135
"googletest/samples/sample3-inl.h",
128136
"googletest/samples/sample4.h",
129137
],
138+
features = select({
139+
":windows": ["windows_export_all_symbols"],
140+
"//conditions:default": [],
141+
}),
130142
)
131143

132144
cc_test(
@@ -145,6 +157,7 @@ cc_test(
145157
"googletest/samples/sample7_unittest.cc",
146158
"googletest/samples/sample8_unittest.cc",
147159
],
160+
linkstatic = 0,
148161
deps = [
149162
"gtest_sample_lib",
150163
":gtest_main",

3rd/googletest/CMakeLists.txt

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1+
# Note: CMake support is community-based. The maintainers do not use CMake
2+
# internally.
3+
14
cmake_minimum_required(VERSION 2.8.8)
25

6+
if (POLICY CMP0048)
7+
cmake_policy(SET CMP0048 NEW)
8+
endif (POLICY CMP0048)
9+
10+
project(googletest-distribution)
11+
set(GOOGLETEST_VERSION 1.10.0)
12+
313
if (CMAKE_VERSION VERSION_LESS "3.1")
414
add_definitions(-std=c++11)
515
else()
616
set(CMAKE_CXX_STANDARD 11)
717
set(CMAKE_CXX_STANDARD_REQUIRED ON)
8-
set(CMAKE_CXX_EXTENSIONS OFF)
18+
if(NOT CYGWIN)
19+
set(CMAKE_CXX_EXTENSIONS OFF)
20+
endif()
921
endif()
1022

11-
if (POLICY CMP0048)
12-
cmake_policy(SET CMP0048 NEW)
13-
endif (POLICY CMP0048)
14-
15-
project(googletest-distribution)
16-
set(GOOGLETEST_VERSION 1.9.0)
17-
1823
enable_testing()
1924

2025
include(CMakeDependentOption)

0 commit comments

Comments
 (0)