summaryrefslogtreecommitdiffstats
path: root/googletest/src/gtest.cc
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Support JSON output format in addition to XMLPetr Hosek2018-02-281-10/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows emitting output in JSON format in addition to the already supported XML format. The implementation as well as the file structure is intentionally modelled after the XML one.
| * | | | cleanup/mergesGennadiy Civil2018-02-131-16/+12
| | |_|/ | |/| |
| * | | Merge branch 'master' into assertrefs/pull/1439/headGennadiy Civil2018-02-091-1/+1
| |\ \ \
| | * | | Fixed typosrefs/pull/1446/headTroy Holsapple2018-02-081-1/+1
| | | | |
| * | | | Add ability to throw from ASSERTAlexey Sokolov2018-02-081-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | while not losing benefits of EXPECT, and not killing the whole test, as with --gtest_throw_on_failure. 183822976
| * | | upstream cl 182543808Gennadiy Civil2018-01-241-0/+7
| | | |
| * | | merges, cl/155419551 and otherGennadiy Civil2018-01-221-4/+5
| | | |
| * | | Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-181-20/+19
| |\ \ \
| | * | | Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-171-20/+19
| | | |/ | | |/|
| * | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-121-1/+1
| |/ /
| * | Upstream cl 103120214Gennadiy Civil2018-01-111-3/+2
| | |
| * | Merge branch 'master' into missing-declarationsrefs/pull/1007/headGennadiy Civil2018-01-051-18/+11
| |\ \
| | * | upstreaming cl 124976692Gennadiy Civil2018-01-031-18/+11
| | | |
| * | | Pass the -Wmissing-declarations warning.David Benjamin2018-01-031-21/+24
| |/ / | | | | | | | | | | | | | | | This makes it easier to use GTest in projects that build with the -Wmissing-declarations warning. This fixes the warning in headers and source files, though not GTest's own tests as it is rather noisy there.
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-011-3/+3
| |\ \ | | |/
| | * Fixes issue #826 by treating MinGW as "non-Windows" when determining colored ↵refs/pull/1324/headwhame2017-11-071-3/+3
| | | | | | | | | | | | output
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-041-1/+1
| |\ \ | | |/
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-241-30/+24
| |\ \
| * | | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in issue #360: "Now that all the platforms gtest supports work with value-parameterized tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from the codebase everywhere." https://github.com/google/googletest/issues/360
* | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2017-11-191-31/+25
|\ \ \ \ | | |_|/ | |/| |
| * | | Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-271-1/+1
| | |/ | |/|
| * | Make the failure messages from EXPECT_EQ and friends actually symmetric,refs/pull/1242/headAlexey Sokolov2017-09-131-4/+5
| | | | | | | | | | | | | | | | | | | | | instead of reading more like reversing the former "expected" and "actual" roles of the LHS and RHS arguments. This patch is manually applied from internal version (125109873)
| * | Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is ↵Gasprd Petit2017-09-071-16/+6
| | | | | | | | | | | | expected to abort()
| * | Merge branch 'master' into user_logger_instead_of_printfGennadiy Civil2017-09-011-1/+1
| |\ \ | | |/
| * | Removed extra colon in error loggpetit2017-08-141-1/+1
| | |
| * | Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printfrefs/pull/1202/headgpetit2017-08-141-27/+76
| |\ \
| * | | Use GTEST_LOG instead of printfgpetit2017-08-141-23/+26
| | | |
* | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2017-09-061-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | change links from former code.google.com to current github repositoryrefs/pull/1241/headHerbert Thielen2017-08-311-1/+1
| | |/ | |/|
* | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2017-08-211-8/+37
|\ \ \ | |/ /
| * | Merge pull request #1127 from zulkarnine/patch-1Gennadiy Civil2017-08-111-3/+31
| |\ \ | | | | | | | | Fix background color in ColoredPrintf
| | * | Remove duplicate coderefs/pull/1127/headZulkarnine Mahmud2017-07-161-16/+6
| | | |
| | * | Fix assumption for foreground bit offsetZulkarnine Mahmud2017-07-151-3/+16
| | | |
| | * | Remove unnecessary constZulkarnine Mahmud2017-06-291-1/+1
| | | |
| | * | Add helper functions for text color calculationZulkarnine Mahmud2017-06-291-24/+25
| | | |
| | * | Fix a problem when bg_color == fg_colorZulkarnine Mahmud2017-06-221-3/+24
| | | | | | | | | | | | Invert the intensity bit if the background_color == foreground_color
| | * | Add background_mask instead of using magic numberZulkarnine Mahmud2017-06-211-1/+2
| | | |
| | * | Fix background color in ColoredPrintfZulkarnine Mahmud2017-06-201-2/+4
| | | | | | | | | | | | | | | | Re-use existing background color for Widows' console window. This fixes a problem where the background color for ColoredPrintf would be BLACK even if the user's console is using a different BG color.
| * | | Merge pull request #1180 from aconverse/masterGennadiy Civil2017-08-071-1/+2
| |\ \ \ | | | | | | | | | | Use wider types to prevent unsigned overflow diagnostics
| | * | | Use wider types to prevent unsigned overflow diagnosticsrefs/pull/1180/headAlex Converse2017-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the (covered) codebase is already integer overflow clean. This is a cherry-pick of an internal change. TESTED=gtest_shuffle_test goes from fail to pass with -fsanitize=integer
| * | | | Merge pull request #1030 from vpfautz/masterGennadiy Civil2017-08-031-1/+1
| |\ \ \ \ | | |/ / / | |/| | | Fixed some typos
| | * | | Fixed some typosrefs/pull/1030/headvpfautz2017-02-261-1/+1
| | | |/ | | |/|
| * | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-021-1/+1
| |\ \ \ | | | | | | | | | | remove duplicated words
| | * | | remove duplicated wordsrefs/pull/764/headLi Peng2016-04-271-1/+1
| | |/ / | | | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
| * | | Merge pull request #962 from klimkin/klimkin-patch-typoGennadiy Civil2017-08-021-1/+1
| |\ \ \ | | | | | | | | | | Fix a typo
| | * | | Fix a typorefs/pull/962/headAlexey Klimkin2016-12-131-1/+1
| | |/ / | | | | | | | | Help says "FILE_PATH defaults to test_details.xml", but the real path is test_detail.xml.
| * | | Colouring in help textrefs/pull/1129/headChris-Sharpe2017-06-211-1/+1
| | |/ | |/|
* | | 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
* | Changes add ability to overwrite TempDir(), issue ↵refs/pull/1096/headGennadiy Civil2017-05-181-1/+3
| | | | | | | | https://github.com/google/googletest/issues/1093
* | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-151-16/+14
| | | | | | | | | | | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.