Commit Graph

2305 Commits

Author SHA1 Message Date
Gennadiy Civil
c423febc50 Changing clang tp 3.9 as 3.7 no longer works on Travis 2018-08-29 22:02:08 -04:00
Gennadiy Civil
dea6fec015 Changing clang tp 3.9 as 3.7 no longer works on Travis 2018-08-29 21:58:47 -04:00
Gennadiy Civil
561579e37d clang 3.7 -> 3.9 2018-08-29 21:52:07 -04:00
Gennadiy Civil
37550a210e clang 3.7->3.9 2018-08-29 21:51:31 -04:00
Gennadiy Civil
6e97022568 Update .travis.yml
Bring travil yml back to the master branch state
2018-08-29 21:21:42 -04:00
Gennadiy Civil
9473f7a808 Update .travis.yml 2018-08-29 21:16:33 -04:00
Gennadiy Civil
ace23df4c4 Testing, trying to figure out clang errors
Possibly related to travis env
2018-08-29 12:37:54 -04:00
Gennadiy Civil
57e1cf48a9 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
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
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
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
1f28eaa2e6 Merge pull request #1784 from DavidSchuldenfrei/add-adapter-to-readme
New Readme.md
2018-08-27 22:50:46 -04:00
David Schuldenfrei
bb3b3a6124 New Readme.md 2018-08-27 22:27:58 +03:00
Gennadiy Civil
4f8ebb27b6 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
8c7ed6e7e5 Merge branch 'master' into fix-1764_CMake-errors-in-googlemock 2018-08-27 13:25:45 -04:00
Gennadiy Civil
fa5485cdcd Update CONTRIBUTING.md 2018-08-27 13:06:43 -04:00
David Schuldenfrei
13908f48e8 Merge 72a2836945 into 1d9a1912e7
Closes #1658

Review and changes, mister@google.com

PiperOrigin-RevId: 210374286
2018-08-27 12:22:33 -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
Gennadiy Civil
e3e76f3b9f 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
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
Gennadiy Civil
cda62dab73 Update README.md 2018-08-24 13:25:40 -04:00
Gennadiy Civil
a635705f3b 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
88a63885a3 Merge branch 'master' into issue_1735 2018-08-24 11:30:02 -04:00
Gennadiy Civil
dcf379f0ef Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
2018-08-23 20:00:01 -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
Gennadiy Civil
698c92ec2f Merge pull request #1338 from stefanosoffia/master
Install CMake export files
2018-08-22 13:05:06 -04:00
Stefano Soffia
ec5d5478fe Install CMake export files
Rework of the closed pull request #768
2018-08-22 17:27:11 +02:00
Gennadiy Civil
a7ed2b0383 Merge pull request #1682 from dakotahawkins/improve-exported-targets
Improve CMake exported targets
2018-08-21 13:51:42 -04: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
7db99f2ce4 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
be972a817d Merge branch 'master' into josh/fix_scoped_class2 2018-08-20 16:15:04 -04:00
Gennadiy Civil
f012a49a16 Update CONTRIBUTING.md 2018-08-20 16:08:33 -04:00
Gennadiy Civil
f2ca24e650 Merge pull request #1759 from gennadiycivil/master
merge
2018-08-20 15:42:27 -04:00
Gennadiy Civil
3935e0f83c merge 2018-08-20 14:57:53 -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
49710fa6e2 Testing, adding a few line to sample4 2018-08-20 14:17:38 -04:00