708 Commits

Author SHA1 Message Date
Dominic Sacré
6626ef1905 Re-generate gtest-param-test.h from gtest-param-test.h.pump
Commit 6a26e47cfcc174cc85651cbde0b0158d03321e2f changed the formatting
of INSTANTIATE_TEST_CASE_P() in the generated header file only.

This commit reverts to the formatting produced by running "pump
gtest-param-test.h.pump", which seems to be more consistent with the
rest of the file.
2018-08-31 14:52:42 +02:00
Gennadiy Civil
22d19ae17d Update googletest-output-test-golden-lin.txt
manual update golden lin
2018-08-30 21:46:15 -04:00
Gennadiy Civil
cf34aa5973 Update googletest-output-test-golden-lin.txt
manual update, golden lin
2018-08-30 21:42:07 -04:00
misterg
e00932356a Googletest export
Silence MSVC warnings

PiperOrigin-RevId: 210726964
2018-08-30 21:33:02 -04:00
Abseil Team
2988059caf Googletest export
Fix the typed test names in the tests for customized typed test parameters.

As required by googletest documentation, the names should not contain an underscore.

PiperOrigin-RevId: 210678652
2018-08-30 21:32:54 -04:00
misterg
ea0db3df39 Googletest export
Internal Change

PiperOrigin-RevId: 210594341
2018-08-30 21:32:41 -04:00
Gennadiy Civil
af9820f2f0 Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4 2018-08-29 22:07:39 -04:00
Steven Santos Erenst
227d903b11 Fix broken FAQ link in primer.md
The current link pointed to a non existing section in the FAQ.
2018-08-28 21:03:19 -07:00
Gennadiy Civil
4ac4037fe4 Disable MCVS warnings 2018-08-28 23:55:17 -04:00
Gennadiy Civil
bf0322d93e typo 2018-08-28 23:46:23 -04:00
Gennadiy Civil
4d67fc0c32 typo 2018-08-28 23:36:50 -04:00
Gennadiy Civil
3515f3d9cb MSVC warnings silence 2018-08-28 23:25:51 -04:00
Gennadiy Civil
a9a835f3db Update googletest-output-test-golden-lin.txt 2018-08-28 23:11:51 -04:00
Abseil Team
6e639d6719 Googletest export
Add the possibility of specifying the name in type parameterized tests.

Similar to how the last parameter of INSTANTIATE_TEST_CASE_P allows to override the name for (non-type) parametrized tests, this adds the possibility of adding a parameter to INSTANTIATE_TYPED_TEST_CASE_P. The argument has to be a class, which contains a static templated function GetName<T>(int), returning the name for type T.

PiperOrigin-RevId: 210532231
2018-08-28 16:53:45 -04:00
Abseil Team
668c1f4440 Googletest export
Breaks Windows builds

PiperOrigin-RevId: 210434120
2018-08-28 16:53:38 -04:00
Abseil Team
e5a824e206 Googletest export
Fix Theta(N^2) memory usage of EXPECT_EQ(string) when the strings don't match.

The underlying CalculateOptimalEdits() implementation used a simple
dynamic-programming approach that always used N^2 memory and time. This meant
that tests for equality of large strings were ticking time bombs: They'd work
fine as long as the test passed, but as soon as the strings differed the test
would OOM, which is very hard to debug.
I switched it out for a Dijkstra search, which is still worst-case O(N^2), but
in the usual case of mostly-matching strings, it is much closer to linear.

PiperOrigin-RevId: 210405025
2018-08-28 16:53:30 -04:00
misterg
d3212ab56c Googletest export
Code Cleanup

PiperOrigin-RevId: 210393771
2018-08-28 16:53:17 -04:00
Gennadiy Civil
8c7ed6e7e5 Merge branch 'master' into fix-1764_CMake-errors-in-googlemock 2018-08-27 13:25:45 -04:00
David Schuldenfrei
13908f48e8 Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7f42e8ae66ea365b5b8508fecb31509
Closes #1658

Review and changes, mister@google.com

PiperOrigin-RevId: 210374286
2018-08-27 12:22:33 -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
Gennadiy Civil
88a63885a3 Merge branch 'master' into issue_1735 2018-08-24 11:30:02 -04:00
misterg
93d9926d27 Googletest export
Remove unneeded check for NULL.
Note: this started as OSS PR https://github.com/google/googletest/pull/967 but changed
PiperOrigin-RevId: 209819732
2018-08-23 16:03:46 -04:00
srz_zumix
fdd19fe97a Googletest export
Internal Change

PiperOrigin-RevId: 209498445
2018-08-23 16:03:39 -04:00
srz_zumix
3c02d17ef4 Googletest export
Internal Change

PiperOrigin-RevId: 209471987
2018-08-23 16:03:31 -04:00
Jacob Schloss
2186ade329 Merge branch 'master' into issue_1735 2018-08-22 12:55:43 -07:00
Jacob Schloss
d4c984e4a8 It seems like CMAKE_CXX_FLAGS is getting double appended when building as a nested cmake project,
which breaks my build as gcc does not allow -specs=nosys.specs to be called multiple times.

Removing this fixes it and seems to keep the same compile options, just removing the duplicate definition.
2018-08-22 11:17:32 -07: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
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
misterg
f11ec7dd52 googletest export
- 209457486 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457486
2018-08-20 14:50:41 -04:00
Gennadiy Civil
3e5131bbd8 Merge pull request #1754 from vkotovv/docs-advanced-broken-links
docs: fixed broken references to sections in Advanced guide
2018-08-20 11:04:11 -04:00
Gennadiy Civil
c597f05687 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-20 10:21:32 -04:00
Vadim Kotov
4e5dc133a1 docs: fix more broken links to sections in Advanced guide 2018-08-20 16:20:14 +03:00
Vadim Kotov
4cc709baf5 docs: fixed broken references to sections in Advanced guide 2018-08-20 15:31:55 +03:00
Gennadiy Civil
b6e0bdc87e Merge branch 'master' into fix-argc 2018-08-19 14:03:30 -04:00
Gennadiy Civil
4ca5924de3 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-18 13:15:35 -04:00
Gennadiy Civil
9054a95a76 Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning
Remove default /EHsc compiler flag
2018-08-17 23:27:19 -04:00
Tanzinul Islam
d6c0ea94c5 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-17 23:58:45 +01:00
Gennadiy Civil
42a3a3e5b0 Merge branch 'master' into patch-1 2018-08-17 15:45:35 -04:00
Vadim Berezniker
9b39018356 std references shouldn't be fully qualified 2018-08-17 10:49:10 -07:00
Gennadiy Civil
d0c8a01252 Formatting 2018-08-17 13:44:48 -04:00
Gennadiy Civil
d7d06d64cb Merge branch 'master' into patch-1 2018-08-17 13:31:01 -04:00
Gennadiy Civil
0637dca26b Minor formatting/style changes 2018-08-17 13:25:52 -04:00
Conor Burgess
dcdd155849 Merge branch 'master' into fix-argc 2018-08-17 17:15:32 +01:00
Gennadiy Civil
ec1ff6bc2a Merge branch 'master' into fix-msvc-d9025-warning 2018-08-17 11:48:56 -04:00
Henry Schreiner
cc134a591e Merge branch 'master' into cleanup-cmake 2018-08-17 13:52:35 +02:00
Gennadiy Civil
135bd480e0 Small formatting change
And then we can merge
2018-08-16 15:10:07 -04:00
Gennadiy Civil
f3d889b430 Merge branch 'master' into master 2018-08-16 13:37:53 -04:00
Gennadiy Civil
0c1dcc2998 Small style changes.
Just small style changes and we can accept this PR
2018-08-16 13:18:13 -04:00
Gennadiy Civil
b5f3df3456 Merge branch 'master' into master 2018-08-16 10:39:40 -04:00