summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken FAQ link in primer.mdrefs/pull/1794/headSteven Santos Erenst2018-08-291-1/+1
| | | The current link pointed to a non existing section in the FAQ.
* Merge branch 'master' into fix-1764_CMake-errors-in-googlemockrefs/pull/1769/headGennadiy Civil2018-08-274-73/+333
|\
| * Merge 72a2836945e7a3dcee0730166704587e10bf64ee into ↵David Schuldenfrei2018-08-274-73/+333
| | | | | | | | | | | | | | | | | | | | 1d9a1912e7f42e8ae66ea365b5b8508fecb31509 Closes #1658 Review and changes, mister@google.com PiperOrigin-RevId: 210374286
* | Use `$<INSTALL_PREFIX>` in `target_include_directories`Dakota Hawkins2018-08-241-2/+2
|/ | | | | | | | | | | | | | | 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 branch 'master' into issue_1735refs/pull/1767/headGennadiy Civil2018-08-241-7/+7
|\
| * Googletest exportrefs/pull/1779/headmisterg2018-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-22126-394/+448
|\ \ | |/
| * Install CMake export filesrefs/pull/1338/headStefano Soffia2018-08-223-49/+72
| | | | | | | | Rework of the closed pull request #768
| * Improve CMake exported targets.refs/pull/1682/headDakota Hawkins2018-08-211-4/+27
| | | | | | | | | | | | | | | | | | | | | | 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>
| * googletest exportmisterg2018-08-208-1/+46
| | | | | | | | | | | | - 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
| * Merge pull request #1754 from vkotovv/docs-advanced-broken-linksGennadiy Civil2018-08-201-5/+5
| |\ | | | | | | docs: fixed broken references to sections in Advanced guide
| | * docs: fix more broken links to sections in Advanced guiderefs/pull/1754/headVadim Kotov2018-08-201-3/+3
| | |
| | * docs: fixed broken references to sections in Advanced guideVadim Kotov2018-08-201-2/+2
| | |
| * | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116refs/pull/1120/headGennadiy Civil2018-08-201-0/+17
| |\ \ | | |/
| | * Merge branch 'master' into fix-argcrefs/pull/1347/headGennadiy Civil2018-08-193-8/+14
| | |\
| | * | Minor formatting/style changesGennadiy Civil2018-08-171-8/+7
| | | |
| | * | Merge branch 'master' into fix-argcConor Burgess2018-08-17152-5308/+8145
| | |\ \
| | * \ \ Merge branch 'master' into fix-argcConor Burgess2018-02-1244-288/+1066
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fix-argcConor Burgess2018-01-1256-665/+336
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fix-argcGennadiy Civil2017-12-082-0/+5
| | |\ \ \ \ \
| | * | | | | | Fix location of `_NSGetArgv` correction.Conor Burgess2017-12-071-10/+11
| | | | | | | |
| | * | | | | | Fix value pointed to by `_NSGetArgc()` on macOSConor Burgess2017-12-071-0/+16
| | | | | | | |
| * | | | | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-182-4/+10
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge pull request #1612 from wkaluza/fix-msvc-d9025-warningGennadiy Civil2018-08-181-0/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove default /EHsc compiler flag
| | | * \ \ \ \ \ Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/headGennadiy Civil2018-08-17140-2707/+3373
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | Remove default /EHsc compiler flagWojciech Kaluza2018-07-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents warning D9025 (one command-line option overrides another) on MSVC builds: some test targets are built with the /EHs-c- which conflicts with /EHsc.
| | * | | | | | | Merge branch 'master' into patch-1refs/pull/1652/headGennadiy Civil2018-08-171-4/+4
| | |\ \ \ \ \ \ \
| | * | | | | | | | FormattingGennadiy Civil2018-08-171-4/+5
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-173-8/+65
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-15141-3000/+3652
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Cast the tr1::tuple_element template parameter to intmedithe2018-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because in `std::tr1::tuple_element` the first template parameter should be of type int (https://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.4/a00547.html), but the code inserts a size_t, the first template parameter should be casted to int before, to get rid of the following errors: googletest-src/googletest/include/gtest/gtest-printers.h:957:60: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion] struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {}; and googletest-src/googletest/include/gtest/gtest-printers.h:961:56: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion] const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get(
| * | | | | | | | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-08-17130-771/+1144
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | std references shouldn't be fully qualifiedrefs/pull/1748/headVadim Berezniker2018-08-171-4/+4
| | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'master' into cleanup-cmakerefs/pull/1546/headHenry Schreiner2018-08-172-4/+46
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Small formatting changeGennadiy Civil2018-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And then we can merge
| | | * | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-161-2/+44
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Small style changes. refs/pull/1142/headGennadiy Civil2018-08-161-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just small style changes and we can accept this PR
| | | | * | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-16157-6020/+9256
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | * | | | | | | | Merge branch 'master' of https://github.com/google/googletestScott Slack-Smith2017-11-24101-13383/+2503
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | *Silence false positive memory leaks reported by Microsoft's debug CRT*Scott Slack-Smith2017-06-301-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new RAII MemoryIsNotDeallocated class that excludes memory allocations from Microsoft’s debug CRT leak detection report. We use this RAII class to silence 2 false positive leaks that are caused by memory allocations that are intentionally never deallocated. *Background* The MS debug CRT has a lightweight memory leak detection mechanism that can only detect if a memory allocation is missing a matching deallocation. Consequently, it will report a false positive leak for memory that’s intentionally never deallocated. For example, memory that’s reachable for the entire lifetime of a app. Note the MS debug CRT is always tracking memory allocations but the final memory leak report is disabled by default. As you can’t avoid paying for its cost, you may as well use it. The memory leak report can be enabled by calling the following function #ifdef _MSC_VER _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF); #endif // _MSC_VER anywhere before exiting main. For example, the following are the false positive leaks reported before this change; Detected memory leaks! Dumping objects -> {750} normal block at 0x015DF938, 8 bytes long. Data: < ] > 00 F9 5D 01 00 00 00 00 {749} normal block at 0x015DEE60, 32 bytes long. Data: <` ] ` ] ` ] > 60 EE 5D 01 60 EE 5D 01 60 EE 5D 01 01 01 CD CD {748} normal block at 0x015DF900, 12 bytes long. Data: <8 ] ` ] > 38 F9 5D 01 60 EE 5D 01 00 00 00 00 {747} normal block at 0x015DA0F8, 24 bytes long. Data: < > FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 Object dump complete. As you can see from above it’s not easy to identify the above are false positives. Consequently, if false positive leaks are not fixed or silenced, then it becomes impractical to identify real memory leaks.
| | | * | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-15123-346/+211
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Merge branch 'master' into mastertisi19882018-08-149-74/+62
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-08-0917-69/+113
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-08-0761-349/+866
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-08-0128-19/+55
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-07-2313-1958/+2117
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-07-123-320/+363
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | |