gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,359 Commits 1 Branch 0 Tags
70de02bf2cfb46ad65e275b89de6dc0eeadbc183
Commit Graph

2359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
misterg
2cc008538c Googletest export 
Internal Change

PiperOrigin-RevId: 210594341
 2018-08-30 21:32:41 -04:00
Gennadiy Civil
b8e2562086 Merge pull request #1790 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-08-29 22:57:12 -04:00
Gennadiy Civil
9ad739833e Update gmock-matchers.h 2018-08-29 22:32:08 -04:00
Gennadiy Civil
1db4a426d4 Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4 2018-08-29 22:07:39 -04:00
Gennadiy Civil
3dbba3b072 Changing clang tp 3.9 as 3.7 no longer works on Travis 2018-08-29 22:02:08 -04:00
Gennadiy Civil
fab2252646 Changing clang tp 3.9 as 3.7 no longer works on Travis 2018-08-29 21:58:47 -04:00
Gennadiy Civil
f1e529a808 clang 3.7 -> 3.9 2018-08-29 21:52:07 -04:00
Gennadiy Civil
d7d21c0b91 clang 3.7->3.9 2018-08-29 21:51:31 -04:00
Gennadiy Civil
a83e98d0e7 Update .travis.yml 
Bring travil yml back to the master branch state
 2018-08-29 21:21:42 -04:00
Gennadiy Civil
964748a902 Update .travis.yml 2018-08-29 21:16:33 -04:00
Gennadiy Civil
e8ebde4f21 Testing, trying to figure out clang errors 
Possibly related to travis env
 2018-08-29 12:37:54 -04:00
Gennadiy Civil
3d56121825 Merge pull request #1794 from BlueMonday/patch-1 
Fix broken FAQ link in primer.md
 2018-08-29 00:43:34 -04:00
Steven Santos Erenst
ca912f8b70 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
e103fa4f2a Disable MCVS warnings 2018-08-28 23:55:17 -04:00
Gennadiy Civil
9b2016a01d typo 2018-08-28 23:46:23 -04:00
Gennadiy Civil
e8e26d25bd typo 2018-08-28 23:36:50 -04:00
Gennadiy Civil
8c0e0d5c17 MSVC warnings silence 2018-08-28 23:25:51 -04:00
Gennadiy Civil
9d9d7a6a89 Update googletest-output-test-golden-lin.txt 2018-08-28 23:11:51 -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
Abseil Team
03867b5389 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
52f8183e7f Googletest export 
Breaks Windows builds

PiperOrigin-RevId: 210434120
 2018-08-28 16:53:38 -04:00
Abseil Team
167c5e8188 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
1bb76182ca Googletest export 
Code Cleanup

PiperOrigin-RevId: 210393771
 2018-08-28 16:53:17 -04:00
Gennadiy Civil
58f3f1005c Merge pull request #1784 from DavidSchuldenfrei/add-adapter-to-readme 
New Readme.md
 2018-08-27 22:50:46 -04:00
David Schuldenfrei
b3d210612c New Readme.md 2018-08-27 22:27:58 +03:00
Gennadiy Civil
2e68926a9d Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemock 
Use `$<INSTALL_PREFIX>` in `target_include_directories`
 2018-08-27 14:13:59 -04:00
Gennadiy Civil
ebb2fca51a Merge branch 'master' into fix-1764_CMake-errors-in-googlemock 2018-08-27 13:25:45 -04:00
Gennadiy Civil
641e7a3752 Update CONTRIBUTING.md 2018-08-27 13:06:43 -04:00
David Schuldenfrei
603ce4b81d Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7 
Closes #1658

Review and changes, mister@google.com

PiperOrigin-RevId: 210374286
 2018-08-27 12:22:33 -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
Gennadiy Civil
9c96f500a3 Merge pull request #1781 from wfvining/fix1764-cmake-errors 
Fix #1764 Remove cmake code that leads to a configuration error
 2018-08-24 16:49:47 -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
Gennadiy Civil
c3d9db428a Update README.md 2018-08-24 13:25:40 -04:00
Gennadiy Civil
bf98ce2bba Merge pull request #1767 from jschloss-swift/issue_1735 
Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
 2018-08-24 11:56:17 -04:00
Gennadiy Civil
205df1058e Merge branch 'master' into issue_1735 2018-08-24 11:30:02 -04:00
Gennadiy Civil
7f11b9ffb5 Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-08-23 20:00:01 -04:00
misterg
87494afca7 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
9dae300121 Googletest export 
Internal Change

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

PiperOrigin-RevId: 209471987
 2018-08-23 16:03:31 -04:00
Jacob Schloss
6de39826aa Merge branch 'master' into issue_1735 2018-08-22 12:55:43 -07:00
Jacob Schloss
6e79801645 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
Gennadiy Civil
1d9a1912e7 Merge pull request #1338 from stefanosoffia/master 
Install CMake export files
 2018-08-22 13:05:06 -04:00
Stefano Soffia
aff0379441 Install CMake export files 
Rework of the closed pull request #768
 2018-08-22 17:27:11 +02:00
Gennadiy Civil
880896c6f4 Merge pull request #1682 from dakotahawkins/improve-exported-targets 
Improve CMake exported targets
 2018-08-21 13:51:42 -04: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
b88511ef64 Merge pull request #1194 from joshbodily/josh/fix_scoped_class2 
Fix scoped enum not working in gmock-gen.py
 2018-08-21 10:32:21 -04:00
Gennadiy Civil
a6e7ba27c7 Merge branch 'master' into josh/fix_scoped_class2 2018-08-20 16:15:04 -04:00
Gennadiy Civil
735bd75f69 Update CONTRIBUTING.md 2018-08-20 16:08:33 -04:00
Gennadiy Civil
ecd844de90 Merge pull request #1759 from gennadiycivil/master 
merge
 2018-08-20 15:42:27 -04:00