Commit Graph

156 Commits

Author SHA1 Message Date
Gennadiy Civil
7b54e1227c Merge branch 'master' into fix-core-dump-shared 2018-01-09 00:22:32 -05:00
Loo Rong Jie
15605813a5 [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
9c7e25968e Merge branch 'master' into missing-declarations 2018-01-04 22:01:38 -05:00
Gennadiy Civil
c8518ae0cb Merge branch 'master' into master 2018-01-04 10:13:00 -05:00
Gennadiy Civil
ce9c285a6c upstreaming cl 124976692 2018-01-03 16:57:05 -05:00
David Benjamin
57561c06f0 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
bc5eddec4c Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-22 14:47:25 -05:00
bryanzim
0e0dc8cdfb Merge branch 'master' into master 2017-12-15 16:52:50 -05:00
Gennadiy Civil
4f3a212568 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-15 15:49:46 -05:00
Carlos O'Ryan
414af0e8a5 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
3c218ff29c Refactor docs about contributions to CONTRIBUTING.md.
Per the review comments.
2017-12-11 19:33:27 -05:00
Bryan Zimmerman
531d5ef77a remove extra line 2017-12-11 12:21:35 -05:00
Bryan Zimmerman
4136c40a6f remove implicit casts 2017-12-11 12:19:56 -05:00
bryanzim
0fb3f4c80b Merge branch 'master' into master 2017-12-11 09:37:55 -05:00
Gennadiy Civil
7b956df687 Merge branch 'master' into use-system-includes 2017-12-08 15:11:13 -05:00
bryanzim
2173579701 Merge branch 'master' into master 2017-12-08 13:11:34 -05:00
Carlos O'Ryan
63723d54aa 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
d70b7007c1 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-08 11:56:41 -05:00
bryanzim
5845063480 Merge branch 'master' into master 2017-12-08 11:31:31 -05:00
Gennadiy Civil
f59e68345b Merge branch 'master' into fix-core-dump-shared 2017-12-08 11:12:19 -05:00
Wojciech Mamrak
98e909ef6d Improved description of VS std::tuple support 2017-12-07 18:18:17 +01:00
Carlos O'Ryan
ab6cd7a97f Run autoconf from top-level directory.
This is part (hopefully all) of the fixes for .  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 .
2017-12-03 14:07:35 -05:00
Romain Geissler
0046dd743f 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
332bd657f9 make includes system 2017-11-27 17:31:07 -06:00
Bryan Zimmerman
bb417ab41e 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
56088debda Remove gcc 6 misleading indentations. 2017-10-25 17:53:01 +02:00
Arkady Shapkin
a938f25467 Fix gmock tests when std::unary_function unavailable 2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
950e2805da Fix tests with VS2015 and VS2017 2017-10-25 16:04:01 +03:00
Dariusz Ostolski
916158a728 : Doc typo fix 2017-10-14 18:33:19 +02:00
Jonathan Wakely
c61e22b1fe Use gender-neutral pronouns in comments and docs 2017-09-27 13:31:13 +01:00
Alex Yursha
4a74a92c89 Fix ellipsis position in examples 2017-09-08 17:20:59 -07:00
Gennadiy Civil
6cf47d4190 Merge pull request from LebedevRI/respect-option
CMake: use threads if allowed and found, not just if found.
2017-09-05 13:07:37 -04:00
Gennadiy Civil
93d050ea56 Merge pull request from Gallaecio/patch-1
Fix WhenSorted() documentation example
2017-09-01 15:20:54 -04:00
Roman Lebedev
7e25cea458 CMake: use threads if allowed and found, not just if found.
If the user's cmakelists.txt first look for threads using
find_package(Threads), then set(gtest_disable_pthreads ON),
and then include googletest. GoogleTest will not look for
threads. But since they have already been found before in
user's cmakelists, it will use them regardless.

This helped me fix build issue in darktable-org/rawspeed
on windows/MSYS2, even though there are threads, and they
are usable, googletest build was failing with issues
about AutoHandle. I was first looking for threads, and only
then including googletest, so no matter the value of
gtest_disable_pthreads, it failed.

The other obvious solution is for user to first include
googletest, and only then look for threads by himself.
2017-09-01 21:02:59 +03:00
Gennadiy Civil
4126de54a7 Merge pull request from zeitounator/wrong-version-reported
Wrong version reported (1.7.0 should be 1.8.0)
2017-09-01 13:38:26 -04:00
Herbert Thielen
b34d59baf1 change links from former code.google.com to current github repository 2017-08-31 18:12:17 +02:00
Herbert Thielen
f48ebe2bcc use plural verb as mentioned in issue 2017-08-29 21:20:46 +02:00
Herbert Thielen
f3f8930215 remove Yob's comma mentioned in issue 2017-08-29 21:19:45 +02:00
Alyssa Wilk
7eb7cbb51d Applying lint checks from upstream google3 2017-08-28 16:13:41 -04:00
Alyssa Wilk
6a0c4aab6d Merge branch 'refs/heads/master' into flag-default 2017-08-28 16:10:12 -04:00
Arkady Shapkin
b0657ae844 Support x64 configuration for old VS2015 projects 2017-08-25 01:58:00 +03:00
Gennadiy Civil
d2cf069fe2 Merge branch 'master' into vs-projects-fix 2017-08-22 22:38:22 -04:00
Arkady Shapkin
40e2b2f67d Support x64 configuration for old VS2010 projects
VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
2017-08-23 01:45:44 +03:00
Roman Perepelitsa
75a9eed0f5 Support ref-qualified member functions in Property(). 2017-08-22 16:06:26 +02:00
Gennadiy Civil
1f4def5cde Merge branch 'master' into wrong-version-reported 2017-08-21 13:11:58 -04:00
Maurice Gilden
fad8a6b4f5 Remove unused variable 2017-08-21 10:10:14 +02:00
Gennadiy Civil
9fdd6ccd92 Added "explicit" as per compiler suggestion 2017-08-20 15:20:13 -04:00
Gennadiy Civil
e5095758ba Proposing these changes, please review
Slightly better names and cleaner tests.
Please review
2017-08-20 15:15:31 -04:00
Maurice Gilden
29e05dea1d Change tabs to spaces in test case 2017-08-18 15:27:02 +02:00
Maurice Gilden
4d864c5e7d Switch return type to class without default constructor 2017-08-18 12:28:50 +02:00