summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-07-264-18/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deprecateGennadiy Civil2018-07-201-4/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-07-194-1918/+1719
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Disable MSVC function deprecation when using ClangLoo Rong Jie2018-07-134-8/+24
| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Change location of generated pkg-config files from CMAKE_BINARY_DIR to ↵Elias Daler2018-08-131-3/+3
| | | | |_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gmock/gtest_BINARY_DIR (#1717)
| | * | | | | | | | | | | | | | | | | | | Clean up cache non-advanced variable for subprojectHenry Fredrick Schreiner2018-04-051-5/+20
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-08-0171-4392/+4880
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-05-1310-22/+273
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-05-056-34/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-04-0121-243/+474
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-03-0592-1087/+3021
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2017-11-1922-195/+265
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2017-09-0644-1262/+1769
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2017-08-2157-11929/+475
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Allow death test child to bypass WER under MinGWTanzinul Islam2017-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mechanics of suppressing debugger trapping and Windows Error Reporting for the crashed child process in a death test are currently guarded under the `GTEST_HAS_SEH` macro. This seems unnecessary, as the logic does not call any APIs related to Structured Error Handling. Replace the guarding macro with the more permissive `GTEST_OS_WINDOWS`, so that Windows toolchains without SEH support (e.g. MinGW) can benefit from it. Fixes: #1116
* | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems like CMAKE_CXX_FLAGS is getting double appended when building as a ↵Jacob Schloss2018-08-221-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into cross-testing-patch-1refs/pull/924/headGennadiy Civil2018-08-1318-99/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | - Fix the broken markdown tablerefs/pull/1731/headYi Zheng2018-08-131-55/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix some format issue
| * | | | | | | | | | | | | | | | | | | | | | | | | | Mode change on a python scriptrefs/pull/1727/headGennadiy Civil2018-08-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1719 from happyCoder92/masterGennadiy Civil2018-08-092-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix broken links
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into masterrefs/pull/1719/headGennadiy Civil2018-08-093-3/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix broken linksWiktor Garbacz2018-08-092-4/+5
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | formatting and small changes related to code management, no functionality ↵Gennadiy Civil2018-08-092-11/+8
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes
| * | | | | | | | | | | | | | | | | | | | | | | | | | code management comments, [ci-skip], no functionality changesGennadiy Civil2018-08-092-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errorsrefs/pull/1721/headGennadiy Civil2018-08-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Update gtest-death-test.ccGennadiy Civil2018-08-091-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errorsGennadiy Civil2018-08-091-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | Formatting tweaks, no functionality changesGennadiy Civil2018-08-0810-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into cross-testing-patch-1Gennadiy Civil2018-08-08198-18882/+11590
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | code management changes, no functionalty changesrefs/pull/1713/headGennadiy Civil2018-08-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-082-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formatting changes and code sync Merge branch 'master' of https://github.com/google/googletest
| * | | | | | | | | | | | | | | | | | | | | | | | | upsream additional printer testGennadiy Civil2018-08-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Formatting changes,small cleanup, no functionality changesrefs/pull/1705/headGennadiy Civil2018-08-076-28/+18
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into suppressDefaultGennadiy Civil2018-08-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Printers test: fixed compilation bug, due to unnecessary parentheses in ↵refs/pull/1673/headPhilipp Paulweber2018-08-031-2/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | declaration
| * | | | | | | | | | | | | | | | | | | | | | | | No default exception handlingWez2018-08-031-15/+50
| |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | one more fixrefs/pull/1696/headGennadiy Civil2018-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | cmake fixesGennadiy Civil2018-08-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | more fixesGennadiy Civil2018-08-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | add --no_stacktrace_support for json-output-unittestGennadiy Civil2018-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | fixes testsGennadiy Civil2018-08-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | cmake test fixesGennadiy Civil2018-08-026-28/+28
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | cmake fixesGennadiy Civil2018-08-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | cmake tests changesGennadiy Civil2018-08-021-12/+12
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | cleaning up and adding test changes to CMakeGennadiy Civil2018-08-026-24/+24
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-0114-33/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into masterrefs/pull/1695/headGennadiy Civil2018-08-0114-33/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into masterrefs/pull/1685/headGennadiy Civil2018-07-3025-1/+44
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Updated broken and outdated URLsPiotr Kąkol2018-07-2514-33/+33
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Corresponding CMake ChangesGennadiy Civil2018-08-011-12/+12
| | | | | | | | | | | | | | | | | | | | | | | |