aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-printersGennadiy Civil2018-02-1512-54/+67
|\
| * Merge pull request #1459 from gennadiycivil/masterGennadiy Civil2018-02-133-26/+34
| |\ | | | | | | cleanup, merges
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1458 from gennadiycivil/masterGennadiy Civil2018-02-139-28/+33
| |\ \ | | | | | | | | cleanup, merges
| | | * cleanup, mergesGennadiy Civil2018-02-133-26/+34
| | |/
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| | |\ | | |/ | |/|
| | * cleanup/mergesGennadiy Civil2018-02-139-28/+33
| | |
* | | Merge branch 'master' into fix-printersGennadiy Civil2018-02-136-70/+88
|\| |
| * | Merge pull request #1457 from gennadiycivil/masterGennadiy Civil2018-02-131-12/+12
| |\| | | | | | | merging, cleaning up
| | * merging, cleaning upGennadiy Civil2018-02-131-12/+12
| |/
| * Merge pull request #1456 from gennadiycivil/masterGennadiy Civil2018-02-131-2/+1
| |\ | | | | | | merges
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1454 from gennadiycivil/masterGennadiy Civil2018-02-131-7/+53
| |\ \ | | | | | | | | merges
| | | * mergesGennadiy Civil2018-02-131-2/+1
| | |/
| | * cxxx11Gennadiy Civil2018-02-131-0/+3
| | |
| | * clang warningsGennadiy Civil2018-02-131-1/+1
| | |
| | * clang warningsGennadiy Civil2018-02-131-2/+2
| | |
| | * https://travis-ci.org/google/googletest/jobs/340995238Gennadiy Civil2018-02-131-5/+5
| | |
| | * clang warning 'https://travis-ci.org/google/googletest/jobs/340987201'Gennadiy Civil2018-02-131-4/+4
| | |
| | * clang warning https://travis-ci.org/google/googletest/jobs/340978022Gennadiy Civil2018-02-131-1/+1
| | |
| | * mergesGennadiy Civil2018-02-131-3/+46
| |/
| * Merge pull request #1452 from gennadiycivil/masterGennadiy Civil2018-02-124-49/+22
| |\ | | | | | | moving JoinAsTuple to internal
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-120-0/+0
| | |\ | | |/ | |/|
| | * moving JoinAsTuple to internalGennadiy Civil2018-02-124-49/+22
| | |
* | | Fix std::iscntrl use in gtest-printers.ccVictor Costan2018-02-121-1/+3
|/ / | | | | | | | | | | | | | | ContainsUnprintableControlCodes() in gtest-printers.cc passes a char argument to std::iscntrl. Although its argument is an int, std::iscntrl produces undefined behavior if its argument is not representable as an unsigned char. The standard library on Windows asserts that the argument is an unsigned char, resulting in an assertion crash on debug builds.
* | Merge pull request #1451 from gennadiycivil/masterGennadiy Civil2018-02-122-7/+9
|\| | | | | merges
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-120-0/+0
| |\ | |/ |/|
* | Merge pull request #1449 from gennadiycivil/masterGennadiy Civil2018-02-101-11/+38
|\ \ | | | | | | merges
| | * Merging, coniniueGennadiy Civil2018-02-122-7/+9
| |/
| * mergingGennadiy Civil2018-02-091-2/+0
| |
| * mergesGennadiy Civil2018-02-091-11/+40
|/
* Merge pull request #1439 from DarthGandalf/assertGennadiy Civil2018-02-095-8/+171
|\ | | | | Add ability to throw from ASSERT
| * Merge branch 'master' into assertGennadiy Civil2018-02-0920-50/+61
| |\ | |/ |/|
* | Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-0914-27/+27
|\ \ | | | | | | Fixed typos
| * | Fixed typosTroy Holsapple2018-02-0714-27/+27
| | |
* | | Merge pull request #1448 from gennadiycivil/masterGennadiy Civil2018-02-095-23/+33
|\ \ \ | |/ / |/| | merges
| * | mergesGennadiy Civil2018-02-095-23/+33
|/ /
* | Include MSVC14 on PRs as wellGennadiy Civil2018-02-061-0/+1
| |
| * Add ability to throw from ASSERTAlexey Sokolov2018-02-085-8/+171
|/ | | | | | | while not losing benefits of EXPECT, and not killing the whole test, as with --gtest_throw_on_failure. 183822976
* Merge pull request #1435 from gennadiycivil/masterGennadiy Civil2018-01-314-22/+67
|\ | | | | Code merges
| * Merges and also adding new bazel build modeGennadiy Civil2018-01-313-1/+4
| |
| * Code mergesGennadiy Civil2018-01-302-22/+64
| |
* | Merge pull request #1434 from gennadiycivil/masterGennadiy Civil2018-01-304-0/+67
|\| | | | | Ability to optionally depend on Abseil plus upstream of 183716547
| * Ability to optionally depend on Abseil plus upstream of 183716547Gennadiy Civil2018-01-304-0/+67
| |
* | Merge pull request #1430 from gennadiycivil/masterGennadiy Civil2018-01-292-6/+72
|\| | | | | Adding tests to googlemock bazel
| * Adding tests to googlemock bazelGennadiy Civil2018-01-262-6/+72
| |
* | Merge pull request #1429 from gennadiycivil/masterGennadiy Civil2018-01-269-34/+86
|\| | | | | Code merges
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-262-1/+4
| |\ | |/ |/|
* | Merge pull request #1428 from lidaobing/patch-2Gennadiy Civil2018-01-261-1/+1
|\ \ | | | | | | Update Documentation.md
| * | Update Documentation.mdLI Daobing2018-01-261-1/+1
| | |