misterg
a50e4f05b3
Googletest export
...
Remove linked_ptr and use std::shared_ptr instead
PiperOrigin-RevId: 218571466
2018-10-26 14:19:51 -04:00
Gennadiy Civil
20eaf6e3a9
Merge pull request #1911 from BrukerJWD:isnice
...
PiperOrigin-RevId: 218384341
2018-10-23 15:13:42 -04:00
Sergio Valverde
58a8da64ce
ACTION table format
2018-10-23 07:57:23 +02:00
Gennadiy Civil
572050dd28
Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix
...
PiperOrigin-RevId: 217923705
2018-10-22 11:28:57 -04:00
Abseil Team
29b47e45cf
Googletest export
...
C++11 code cleanup.
PiperOrigin-RevId: 217364243
2018-10-18 11:32:16 -04:00
Gennadiy Civil
2c19680bf9
Merge branch 'master' into relocatable-pkgconfig-fix
2018-10-17 09:51:26 -07:00
Jonathan Wendeborn
0cefda7749
Removed last reference to internal::kDefault
2018-10-16 08:51:33 +02:00
Jonathan Wendeborn
96d1615772
Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isnice
2018-10-16 08:38:34 +02:00
BrukerJWD
8c82ba48e4
Merge branch 'master' into isnice
2018-10-16 08:37:56 +02:00
Jonathan Wendeborn
386391b014
Use existing Mock::GetReactionOnUninterestingCalls()
2018-10-16 08:37:45 +02:00
Jonathan Wendeborn
6bbf911a8d
Don't fully qualify enum member
2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
67a240a107
Added Mock::IsNaggy, IsNice, and IsStrict
2018-10-16 08:07:15 +02:00
Gennadiy Civil
a651a4d44e
Merge pull request #1908 from rwoldberg:master
...
PiperOrigin-RevId: 216909845
2018-10-12 16:12:32 -04:00
Robert Woldberg
dec3b81a08
Change types to remove cast warnings.
2018-10-12 11:12:55 -06:00
Abseil Team
bc6a4ce380
Project import generated by Copybara.
...
PiperOrigin-RevId: 216423319
2018-10-11 12:44:00 -04:00
misterg
0e71eb069a
Internal Change
...
PiperOrigin-RevId: 216417182
2018-10-11 12:43:52 -04:00
Filipp Andjelo
095b3113e7
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
78761b58fc
Remove non-variadic pre C++11 AnyOf
...
PiperOrigin-RevId: 216411381
2018-10-09 16:30:37 -04:00
Abseil Team
7d3b73c85a
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
5434989dbd
Remove testing::internal::BothOfMatcher, no longer needed
...
PiperOrigin-RevId: 216389313
2018-10-09 16:25:51 -04:00
Gennadiy Civil
272c08380a
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
4ac07de8de
Fixing AllOfMatches test, where it properly belongs
...
PiperOrigin-RevId: 216193701
2018-10-08 17:07:05 -04:00
misterg
fab35920ad
Remove non-variadic pre C++11 AllOf
...
PiperOrigin-RevId: 216183352
2018-10-08 10:51:03 -04:00
Abseil Team
4bb49ed640
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
f5260ae757
Merge c798e39a4f96f5a985126cc3fab4738b6412cfc1 into e93da23920
...
Closes #1836
PiperOrigin-RevId: 215461025
2018-10-02 17:41:16 -04:00
Marco Bubke
7796273056
Merge 86fe8a25eb5a6e4546f9e39cf23a5c764217bf85 into 440527a61e
...
Closes #1867
PiperOrigin-RevId: 215392714
2018-10-02 13:03:35 -04:00
misterg
ba974c97ac
Googletest export
...
Remove non-variadic pre C++11 ElementsAreMatcher and UnorderedElementsAreMatcher
PiperOrigin-RevId: 214266944
2018-09-25 13:05:17 -04:00
Matthieu Longo
0a18c106ac
[msys] pass big object file option to assembler for target gmock-matchers_test
2018-09-18 18:28:29 +02:00
Gennadiy Civil
28c2989eea
Merge pull request #1837 from google/9A681768AABE08D1EFA5CA77528236A4
...
Googletest export
2018-09-14 11:43:05 -04:00
Abseil Team
ffc9baeb4c
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
5c89346def
Update README.md
2018-09-13 17:22:16 -04:00
Romain Geissler
93b05da26c
Fix gcc misleading indentation again.
2018-09-10 01:45:14 +02:00
Arkady Shapkin
e6c407d605
Fix doc links
2018-09-04 23:07:18 +03:00
Gennadiy Civil
990bf4ffd1
Merge branch 'master' into fix-gmock-pkgconfig
2018-09-04 10:59:31 -04:00
Arkady Shapkin
de9675986f
Update documentation to syntax highlight code
2018-09-03 21:56:23 +03:00
David Seifert
79875d320e
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
a5cc7aa3fe
Googletest export
...
Fix broken OSS windows build.
PiperOrigin-RevId: 210969049
2018-08-30 21:33:10 -04:00
misterg
2cc008538c
Googletest export
...
Internal Change
PiperOrigin-RevId: 210594341
2018-08-30 21:32:41 -04:00
Gennadiy Civil
9ad739833e
Update gmock-matchers.h
2018-08-29 22:32:08 -04:00
Abseil Team
65d03530e6
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
ebb2fca51a
Merge branch 'master' into fix-1764_CMake-errors-in-googlemock
2018-08-27 13:25:45 -04:00
Abseil Team
a0e62d9f1a
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
b19292e6b6
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
08aa7c67dd
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
aff0379441
Install CMake export files
...
Rework of the closed pull request #768
2018-08-22 17:27:11 +02:00
Dakota Hawkins
759ef7c4e9
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
a6e7ba27c7
Merge branch 'master' into josh/fix_scoped_class2
2018-08-20 16:15:04 -04:00
misterg
df428ec118
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
a65a993a3c
Merge branch 'master' into cleanup-cmake
2018-08-17 13:52:35 +02:00
Gennadiy Civil
21e518557a
Merge branch 'master' into josh/fix_scoped_class2
2018-08-16 11:13:12 -04:00