Commit Graph

393 Commits

Author SHA1 Message Date
Abseil Team
63ad9ec911 Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218618184
2018-10-26 14:19:59 -04:00
misterg
55c37984f7 Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218571466
2018-10-26 14:19:51 -04:00
Gennadiy Civil
4887e99ed1 Merge pull request #1911 from BrukerJWD:isnice
PiperOrigin-RevId: 218384341
2018-10-23 15:13:42 -04:00
Sergio Valverde
3860616231 ACTION table format 2018-10-23 07:57:23 +02:00
Gennadiy Civil
a79c35d96f Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix
PiperOrigin-RevId: 217923705
2018-10-22 11:28:57 -04:00
Abseil Team
b1f6f40f1a Googletest export
C++11 code cleanup.

PiperOrigin-RevId: 217364243
2018-10-18 11:32:16 -04:00
Gennadiy Civil
148b17258d Merge branch 'master' into relocatable-pkgconfig-fix 2018-10-17 09:51:26 -07:00
Jonathan Wendeborn
3dc4516fa1 Removed last reference to internal::kDefault 2018-10-16 08:51:33 +02:00
Jonathan Wendeborn
bba91d6669 Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isnice 2018-10-16 08:38:34 +02:00
BrukerJWD
55d2fbfe0d Merge branch 'master' into isnice 2018-10-16 08:37:56 +02:00
Jonathan Wendeborn
a69718965a Use existing Mock::GetReactionOnUninterestingCalls() 2018-10-16 08:37:45 +02:00
Jonathan Wendeborn
ad519f83db Don't fully qualify enum member 2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
7014070b27 Added Mock::IsNaggy, IsNice, and IsStrict 2018-10-16 08:07:15 +02:00
Gennadiy Civil
af5df9cbca Merge pull request #1908 from rwoldberg:master
PiperOrigin-RevId: 216909845
2018-10-12 16:12:32 -04:00
Robert Woldberg
2e8ddd72be Change types to remove cast warnings. 2018-10-12 11:12:55 -06:00
Abseil Team
697d8f386e Project import generated by Copybara.
PiperOrigin-RevId: 216423319
2018-10-11 12:44:00 -04:00
misterg
82922524f4 Internal Change
PiperOrigin-RevId: 216417182
2018-10-11 12:43:52 -04:00
Filipp Andjelo
1ccfeccee9 Use pcfiledir for prefix in pkgconfig file
Using absolute paths in the pkg-config file makes it not relocatable and
leads to problems, when trying to use it with precompiled cross
toolchains. Setting prefix to relative path based on pcfiledir makes it
more reliable for such cases.
2018-10-11 14:09:57 +02:00
misterg
b208478537 Remove non-variadic pre C++11 AnyOf
PiperOrigin-RevId: 216411381
2018-10-09 16:30:37 -04:00
Abseil Team
dd4e36663c Unconditionally use std::tuple.
Remove all mention of TR1 tuple and our own implementation of tuple.

PiperOrigin-RevId: 216395043
2018-10-09 16:25:58 -04:00
misterg
0a82a5a5ab Remove testing::internal::BothOfMatcher, no longer needed
PiperOrigin-RevId: 216389313
2018-10-09 16:25:51 -04:00
Gennadiy Civil
6e0394c346 Delete CHANGES
We are not maintaining change log, it has not been touched for a long time
2018-10-09 11:16:06 -04:00
misterg
f4fea9ea8c Fixing AllOfMatches test, where it properly belongs
PiperOrigin-RevId: 216193701
2018-10-08 17:07:05 -04:00
misterg
a48e4d2375 Remove non-variadic pre C++11 AllOf
PiperOrigin-RevId: 216183352
2018-10-08 10:51:03 -04:00
Abseil Team
7a6bc673ea Apply clang-tidy modernize-use-nullptr to googletest.
Now that googletest has moved to C++11, it should no longer
use NULL or 0 for the null pointer. This patch converts all
such usages to nullptr using clang-tidy.

This prevents LLVM from issuing -Wzero-as-null-pointer-constant
warnings.

PiperOrigin-RevId: 215814400
2018-10-05 12:54:14 -04:00
Matthieu
962abd75d8 Merge c798e39a4f into e93da23920
Closes #1836

PiperOrigin-RevId: 215461025
2018-10-02 17:41:16 -04:00
Marco Bubke
db0cd0e1ee Merge 86fe8a25eb into 440527a61e
Closes #1867

PiperOrigin-RevId: 215392714
2018-10-02 13:03:35 -04:00
misterg
d87ebc8397 Googletest export
Remove non-variadic pre C++11 ElementsAreMatcher and UnorderedElementsAreMatcher

PiperOrigin-RevId: 214266944
2018-09-25 13:05:17 -04:00
Matthieu Longo
753959a6fc [msys] pass big object file option to assembler for target gmock-matchers_test 2018-09-18 18:28:29 +02:00
Gennadiy Civil
62ee77f3d5 Merge pull request #1837 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
2018-09-14 11:43:05 -04:00
Abseil Team
ccce843d80 Googletest export
Treat default-constructed string_view same as constructed from "".
In the context of string comparison (e.g. HasSubstr, StartsWith, EndsWith,
etc.), a default-constructed string_view (nullptr) should be semantically same
as a empty string "".

PiperOrigin-RevId: 212816839
2018-09-14 11:13:48 -04:00
Gennadiy Civil
44efe703b7 Update README.md 2018-09-13 17:22:16 -04:00
Romain Geissler
ff5d6c907b Fix gcc misleading indentation again. 2018-09-10 01:45:14 +02:00
Arkady Shapkin
e7668ee9d7 Fix doc links 2018-09-04 23:07:18 +03:00
Gennadiy Civil
aa45b8bae4 Merge branch 'master' into fix-gmock-pkgconfig 2018-09-04 10:59:31 -04:00
Arkady Shapkin
33ca9f1dec Update documentation to syntax highlight code 2018-09-03 21:56:23 +03:00
David Seifert
e4111d13ca pkgconfig: Unconditionally depend on GTest when using GMock
* GTest is a required dependency for GMock, hence
  we always need to pull it in.
2018-09-02 16:25:18 +02:00
misterg
617e9f71a3 Googletest export
Fix broken OSS windows build.

PiperOrigin-RevId: 210969049
2018-08-30 21:33:10 -04:00
misterg
ea0db3df39 Googletest export
Internal Change

PiperOrigin-RevId: 210594341
2018-08-30 21:32:41 -04:00
Gennadiy Civil
25d7bd5af9 Update gmock-matchers.h 2018-08-29 22:32:08 -04:00
Abseil Team
a201ec4c5a Googletest export
Fix line that was wrapping in the middle of a link

This looks uglier, but has the advantage that the link is kept in one
piece.

PiperOrigin-RevId: 210537337
2018-08-28 16:53:52 -04:00
Gennadiy Civil
8c7ed6e7e5 Merge branch 'master' into fix-1764_CMake-errors-in-googlemock 2018-08-27 13:25:45 -04:00
Abseil Team
b8dfc2efee No longer require a functor passed to ResultOf matcher to define result_of type.
This makes ResultOf more convenient to use. In particular, the matcher now accepts
lambdas.

PiperOrigin-RevId: 210118509
2018-08-27 12:22:26 -04:00
Dakota Hawkins
ddf15e952e Use $<INSTALL_PREFIX> in target_include_directories
To make sure packages are relocatable, use `$<INSTALL_PREFIX>` in
`$<INSTALL_INTERFACE:...>` `target_include_directories`.

`$<INSTALL_PREFIX>` was introduced in CMake 2.8.11, which is already
being checked for locally.

References:

- https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#id19
- https://github.com/robotology/how-to-export-cpp-library/blob/claudio/headeronly/src/LibTemplateCMake/CMakeLists.txt#L42

Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
2018-08-24 16:51:55 -04:00
Will Vining
27aacbbf64 Fix #1764 Remove cmake code that leads to a configuration error
This step is no longer necessary. The configuration given in the
googletest README.md is sufficient to bring in all the googlemock
headers.
2018-08-24 12:52:32 -06:00
Stefano Soffia
ec5d5478fe Install CMake export files
Rework of the closed pull request #768
2018-08-22 17:27:11 +02:00
Dakota Hawkins
70c7e06c00 Improve CMake exported targets.
I _think_ this represents some of the "best practices" for exporting
targets. They'll be available in a `googletest::` namespace (e.g.
`googletest::gmock`) with non-namespaced `ALIAS` targets.

- Added GOOGLETEST_VERSION variable
- Use `CMakePackageConfigHelpers`, bump minimum CMake version to 2.8.8

Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
2018-08-21 13:02:09 -04:00
Gennadiy Civil
be972a817d Merge branch 'master' into josh/fix_scoped_class2 2018-08-20 16:15:04 -04:00
misterg
11b91b042a googletest export
- 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457654
2018-08-20 14:50:48 -04:00
Henry Schreiner
cc134a591e Merge branch 'master' into cleanup-cmake 2018-08-17 13:52:35 +02:00