aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Changing clang tp 3.9 as 3.7 no longer works on TravisGennadiy Civil2018-08-291-2/+2
| |
* | Changing clang tp 3.9 as 3.7 no longer works on TravisGennadiy Civil2018-08-293-3/+3
| |
* | Merge pull request #1794 from BlueMonday/patch-1Gennadiy Civil2018-08-291-1/+1
|\ \ | | | | | | Fix broken FAQ link in primer.md
| * | Fix broken FAQ link in primer.mdSteven Santos Erenst2018-08-281-1/+1
|/ / | | | | The current link pointed to a non existing section in the FAQ.
| * clang 3.7 -> 3.9Gennadiy Civil2018-08-291-1/+1
| |
| * clang 3.7->3.9Gennadiy Civil2018-08-291-2/+2
| |
| * Update .travis.ymlGennadiy Civil2018-08-291-9/+3
| | | | | | Bring travil yml back to the master branch state
| * Update .travis.ymlGennadiy Civil2018-08-291-1/+9
| |
| * Testing, trying to figure out clang errors Gennadiy Civil2018-08-291-2/+0
| | | | | | Possibly related to travis env
| * Disable MCVS warningsGennadiy Civil2018-08-281-0/+8
| |
| * typoGennadiy Civil2018-08-281-1/+1
| |
| * typoGennadiy Civil2018-08-281-1/+1
| |
| * MSVC warnings silenceGennadiy Civil2018-08-281-1/+7
| |
| * Update googletest-output-test-golden-lin.txtGennadiy Civil2018-08-281-5/+55
| |
| * Googletest exportAbseil Team2018-08-282-3/+4
| | | | | | | | | | | | | | | | | | 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
| * Googletest exportAbseil Team2018-08-284-53/+247
| | | | | | | | | | | | | | | | 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
| * Googletest exportAbseil Team2018-08-285-580/+265
| | | | | | | | | | | | Breaks Windows builds PiperOrigin-RevId: 210434120
| * Googletest exportAbseil Team2018-08-285-265/+580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Googletest exportmisterg2018-08-281-6/+1
|/ | | | | | Code Cleanup PiperOrigin-RevId: 210393771
* Merge pull request #1784 from DavidSchuldenfrei/add-adapter-to-readmeGennadiy Civil2018-08-271-0/+2
|\ | | | | New Readme.md
| * New Readme.mdDavid Schuldenfrei2018-08-271-0/+2
|/
* Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemockGennadiy Civil2018-08-272-4/+4
|\ | | | | Use `$<INSTALL_PREFIX>` in `target_include_directories`
| * Merge branch 'master' into fix-1764_CMake-errors-in-googlemockGennadiy Civil2018-08-277-109/+387
| |\ | |/ |/|
* | Update CONTRIBUTING.mdGennadiy Civil2018-08-271-2/+1
| |
* | Merge 72a2836945e7a3dcee0730166704587e10bf64ee into ↵David Schuldenfrei2018-08-274-73/+333
| | | | | | | | | | | | | | | | | | | | 1d9a1912e7f42e8ae66ea365b5b8508fecb31509 Closes #1658 Review and changes, mister@google.com PiperOrigin-RevId: 210374286
* | No longer require a functor passed to ResultOf matcher to define `result_of` ↵Abseil Team2018-08-272-34/+53
| | | | | | | | | | | | | | | | | | type. This makes ResultOf more convenient to use. In particular, the matcher now accepts lambdas. PiperOrigin-RevId: 210118509
| * Use `$<INSTALL_PREFIX>` in `target_include_directories`Dakota Hawkins2018-08-242-4/+4
|/ | | | | | | | | | | | | | | 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>
* Merge pull request #1781 from wfvining/fix1764-cmake-errorsGennadiy Civil2018-08-241-21/+0
|\ | | | | Fix #1764 Remove cmake code that leads to a configuration error
| * Fix #1764 Remove cmake code that leads to a configuration errorWill Vining2018-08-241-21/+0
|/ | | | | | This step is no longer necessary. The configuration given in the googletest README.md is sufficient to bring in all the googlemock headers.
* Update README.mdGennadiy Civil2018-08-241-1/+1
|
* Merge pull request #1767 from jschloss-swift/issue_1735Gennadiy Civil2018-08-241-1/+1
|\ | | | | Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
| * Merge branch 'master' into issue_1735Gennadiy Civil2018-08-241-7/+7
| |\ | |/ |/|
* | Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-08-231-7/+7
|\ \ | | | | | | Googletest export
| * | Googletest exportmisterg2018-08-231-7/+7
| | | | | | | | | | | | | | | | | | Remove unneeded check for NULL. Note: this started as OSS PR https://github.com/google/googletest/pull/967 but changed PiperOrigin-RevId: 209819732
| * | Googletest exportsrz_zumix2018-08-233-61/+23
| | | | | | | | | | | | | | | | | | Internal Change PiperOrigin-RevId: 209498445
| * | Googletest exportsrz_zumix2018-08-233-23/+61
|/ / | | | | | | | | | | Internal Change PiperOrigin-RevId: 209471987
| * Merge branch 'master' into issue_1735Jacob Schloss2018-08-22182-594/+620
| |\ | |/ |/|
* | Merge pull request #1338 from stefanosoffia/masterGennadiy Civil2018-08-226-178/+93
|\ \ | | | | | | Install CMake export files
| * | Install CMake export filesStefano Soffia2018-08-226-178/+93
|/ / | | | | | | Rework of the closed pull request #768
* | Merge pull request #1682 from dakotahawkins/improve-exported-targetsGennadiy Civil2018-08-214-20/+122
|\ \ | | | | | | Improve CMake exported targets
| * | Improve CMake exported targets.Dakota Hawkins2018-08-214-20/+122
|/ / | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #1194 from joshbodily/josh/fix_scoped_class2Gennadiy Civil2018-08-212-0/+21
|\ \ | | | | | | Fix scoped enum not working in gmock-gen.py
| * \ Merge branch 'master' into josh/fix_scoped_class2Gennadiy Civil2018-08-2023-40/+203
| |\ \ | |/ / |/| |
* | | Update CONTRIBUTING.mdGennadiy Civil2018-08-201-4/+5
| | |
* | | Merge pull request #1759 from gennadiycivil/masterGennadiy Civil2018-08-200-0/+0
|\ \ \ | | | | | | | | merge
| * \ \ mergeGennadiy Civil2018-08-2014-19/+70
| |\ \ \ | |/ / / |/| | |
* | | | googletest exportmisterg2018-08-2011-9/+63
| | | | | | | | | | | | | | | | | | | | | | | | - 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457654
* | | | googletest exportmisterg2018-08-203-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | - 209457486 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457486
| * | | Testing, adding a few line to sample4Gennadiy Civil2018-08-2013-532/+21
| | | |
| * | | Testing, adding to sample4 unittestGennadiy Civil2018-08-2010-0/+532
|/ / /