gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,933 Commits 1 Branch 0 Tags
9406a60c7839052e4944ea4dbc8344762a89f9bd
Commit Graph

926 Commits

Author SHA1 Message Date
Gennadiy Civil
af463c43ac More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Gennadiy Civil
dbf63e38a4 merges-2 2018-03-05 13:28:13 -05:00
Gennadiy Civil
a518bd5cf2 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil
0d5e01ad7b Merges-1 2018-03-05 12:26:15 -05:00
Gennadiy Civil
f8fbe1c821 Merge branch 'master' into unsigned-wchar 2018-03-01 11:18:17 -05:00
Xiaoyi Zhang
e1622337ae Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher 2018-02-27 16:06:07 -05:00
Xiaoyi Zhang
576d689c19 Merge branch 'master' into variant_matcher 2018-02-27 16:03:36 -05:00
Xiaoyi Zhang
2eb31c185c Add documentation for VariantWith. 2018-02-27 16:00:42 -05:00
Gennadiy Civil
2bd1750ba7 gmock merging -2 2018-02-27 13:51:09 -05:00
Xiaoyi Zhang
190e2cdd0b Add matcher for std::variant. 2018-02-27 11:36:21 -05:00
Scott Graham
567b40eeb1 Try to handle unsigned wchar_t (arm) a bit better 2018-02-23 12:28:09 -08:00
Gennadiy Civil
225e6741ac moving JoinAsTuple to internal 2018-02-12 16:42:12 -05:00
Gennadiy Civil
22a115055a Merge pull request #1446 from tholsapp/master 
Fixed typos
 2018-02-09 11:34:26 -05:00
Gennadiy Civil
ec7faa943d merges 2018-02-09 10:41:09 -05:00
Troy Holsapple
c8510504dd Fixed typos 2018-02-07 22:06:00 -08:00
Gennadiy Civil
6c0c389601 Adding tests to googlemock bazel 2018-01-26 16:30:57 -05:00
Gennadiy Civil
fbb48a7708 Code merges 2018-01-26 11:57:58 -05:00
Gennadiy Civil
0e6da4cead Merge branch 'master' into fix-core-dump-shared 2018-01-09 00:22:32 -05:00
Loo Rong Jie
cbd15d417e [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc 
and x64_windows_msvc
 2018-01-09 08:29:44 +08:00
Gennadiy Civil
6b4967a23a Merge branch 'master' into missing-declarations 2018-01-04 22:01:38 -05:00
Gennadiy Civil
4216f869f7 Merge branch 'master' into master 2018-01-04 10:13:00 -05:00
Gennadiy Civil
1c09831acc upstreaming cl 124976692 2018-01-03 16:57:05 -05:00
David Benjamin
b3d9be5c1d Pass the -Wmissing-declarations warning. 
This makes it easier to use GTest in projects that build with the
-Wmissing-declarations warning. This fixes the warning in headers and
source files, though not GTest's own tests as it is rather noisy there.
 2018-01-03 14:50:22 -05:00
Gennadiy Civil
e76c3f837c Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-22 14:47:25 -05:00
bryanzim
8cbda54f48 Merge branch 'master' into master 2017-12-15 16:52:50 -05:00
Gennadiy Civil
f6c44fe318 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-15 15:49:46 -05:00
Josh Bodily
3e2cb75446 Merge branch 'master' into josh/fix_scoped_class2 2017-12-12 10:36:37 -07:00
Carlos O'Ryan
f34cbefe50 Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license 2017-12-11 19:34:19 -05:00
Carlos O'Ryan
23a014ab57 Refactor docs about contributions to CONTRIBUTING.md. 
Per the review comments.
 2017-12-11 19:33:27 -05:00
Bryan Zimmerman
74a5306313 remove extra line 2017-12-11 12:21:35 -05:00
Bryan Zimmerman
3ea06317cd remove implicit casts 2017-12-11 12:19:56 -05:00
bryanzim
f98c20baa8 Merge branch 'master' into master 2017-12-11 09:37:55 -05:00
Gennadiy Civil
10ef1d9a1e Merge branch 'master' into use-system-includes 2017-12-08 15:11:13 -05:00
bryanzim
d6a4478caf Merge branch 'master' into master 2017-12-08 13:11:34 -05:00
Carlos O'Ryan
cf3adad594 Add licenses() directive for googlemock/tests. 
Without the directive embedding googletest into third_party breaks
any //... target.
 2017-12-08 12:08:25 -05:00
Gennadiy Civil
a30e15b144 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-08 11:56:41 -05:00
bryanzim
4aae1600d0 Merge branch 'master' into master 2017-12-08 11:31:31 -05:00
Gennadiy Civil
cdedd189b2 Merge branch 'master' into fix-core-dump-shared 2017-12-08 11:12:19 -05:00
Wojciech Mamrak
3464f76e89 Improved description of VS std::tuple support 2017-12-07 18:18:17 +01:00
Carlos O'Ryan
aea8580ecf Run autoconf from top-level directory. 
This is part (hopefully all) of the fixes for #776.  The top-level
configure.ac configures googletest first and then googlemock.
With this changes it is possible to embed googletest into another
project that uses autoconf.  For an example (though it is WIP), see
the commits (and soon PR) referenced from google/protobuf#236.
 2017-12-03 14:07:35 -05:00
Romain Geissler
0663ce9024 Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both. 2017-12-02 22:47:20 +01:00
Sam Lunt
f46bd00e36 make includes system 2017-11-27 17:31:07 -06:00
Bryan Zimmerman
1ae4096b9c fix for VS2017 deprecation of ::tr1::tuple 
change static_cast to ImplicitCast_ for consitency
fixes for building with path names containing spaces
 2017-10-27 14:01:16 -04:00
Romain Geissler
20e2de7d8b Remove gcc 6 misleading indentations. 2017-10-25 17:53:01 +02:00
Arkady Shapkin
840c711e7b Fix gmock tests when std::unary_function unavailable 2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
2641b021fc Fix tests with VS2015 and VS2017 2017-10-25 16:04:01 +03:00
Dariusz Ostolski
ecb1c3ddb6 #1282: Doc typo fix 2017-10-14 18:33:19 +02:00
Jonathan Wakely
b70cf1a663 Use gender-neutral pronouns in comments and docs 2017-09-27 13:31:13 +01:00
Alex Yursha
4f68ab5b84 Fix ellipsis position in examples 2017-09-08 17:20:59 -07:00
Gennadiy Civil
857ddeadeb Merge pull request #975 from LebedevRI/respect-option 
CMake: use threads if allowed and found, not just if found.
 2017-09-05 13:07:37 -04:00