aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix WhenSorted() documentation exampleGallaecio2016-10-081-1/+1
|
* Merge pull request #876 from marco-m/patch-1Billy Donahue2016-09-211-1/+1
|\ | | | | mock cookbook: fix broken relative link
| * Cookbok: fix broken relative linkMarco Molteni2016-09-131-1/+1
|/
* Merge pull request #856 from KindDragon/mingw-appveyorBilly Donahue2016-09-072-2/+2
|\ | | | | Fix Mingw-w64 build
| * Fix build with MinGW-w64Arkadiy Shapkin2016-09-052-2/+2
|/
* Merge pull request #721 from ilmagico/fix-mingw-threadsBilly Donahue2016-08-244-5/+20
|\ | | | | Fix compilation of googletest with MinGW using Win32 threads
| * Don't use pthread when on MinGW even if availableDaniele Tamino2016-02-221-1/+3
| | | | | | | | It's not supported, and native Windows threading is available for MinGW
| * Fix compilation on MinGW with native threadsDaniele Tamino2016-02-223-4/+17
| |
* | Merge pull request #821 from mazong1123/masterBilly Donahue2016-07-141-2/+6
|\ \ | | | | | | Fixed issue #775. Mark the ConvertibleFromAny constructor as explicit, and fix operator overload issue for Unprintable
| * | Reformatted the Unprintable operator== code style.mazong11232016-07-141-1/+4
| | |
| * | Fixed issue #775mazong11232016-07-141-2/+3
|/ /
* | Merge pull request #814 from google/BillyDonahue-patch-2Billy Donahue2016-06-281-0/+1
|\ \ | | | | | | Add Appveyor badge to Readme.md
| * | Add Appveyor badge to Readme.mdBilly Donahue2016-06-281-0/+1
|/ /
* | Merge pull request #723 from KindDragon/masterBilly Donahue2016-06-284-5/+88
|\ \ | | | | | | Run MSVC tests on AppVeyor
| * | Support running MSVC build on AppVeyourArkadiy Shapkin2016-06-274-5/+88
|/ /
* | Merge pull request #810 from google/rollback_808Billy Donahue2016-06-261-2/+2
|\ \ | | | | | | Rollback change #808.
| * | Rollback change #808.Billy Donahue2016-06-261-2/+2
|/ /
* | Merge pull request #808 from djmott/masterBilly Donahue2016-06-261-2/+2
|\ \ | | | | | | fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions th…
| * | Fix to tests that return object which implement operator boolDavid Mott2016-06-251-2/+2
| | |
| * | fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that ↵David Mott2016-06-251-2/+2
|/ / | | | | | | implement operator bool
* | Merge pull request #773 from mazong1123/masterBilly Donahue2016-05-158-3/+331
|\ \ | | | | | | Fixed googletest dir issue for building googlemock.
| * | Added VS 2015 project support.mazong11232016-05-155-0/+328
| | |
| * | Updated the value of GTEST_DIR to reflect the googletest dir.mazong11232016-05-151-1/+1
| | |
| * | Changed the GTestDir marco value to reflect the new dir of googletest.mazong11232016-05-152-2/+2
|/ /
* | Merge pull request #741 from mbinna/patch-1Billy Donahue2016-03-161-5/+4
|\ \ | | | | | | Fix whitespace in paragraph
| * | Fix whitespace in paragraphManuel Binna2016-03-161-5/+4
|/ /
* | Merge pull request #724 from duggelz/masterBilly Donahue2016-03-153-5/+38
|\ \ | | | | | | Read Bazel's $XML_OUTPUT_FILE environment variable
| * | Restructure test so each scenario is independent.Doug Greiman2016-03-021-20/+13
| | |
| * | Fix env_var_test to ignore XML_OUTPUT_FILE if already setDoug Greiman2016-03-011-0/+2
| | |
| * | Restructure $XML_OUTPUT_FILE logicDoug Greiman2016-02-264-26/+32
| | |
| * | Fix inconsistent styleDoug Greiman2016-02-251-1/+1
| | |
| * | Read Bazel's $XML_OUTPUT_FILE environment variableDoug Greiman2016-02-234-2/+34
| | | | | | | | | | | | | | | | | | If $XML_OUTPUT_FILE is set, and $GTEST_OUTPUT and --gtest_output are not specified, produce output as if GTEST_OUTPUT=xml:$XML_OUTPUT_FILE had been set.
* | | Merge pull request #735 from phad/patch-1Billy Donahue2016-03-081-1/+1
|\ \ \ | | | | | | | | Fix typo (Inovke -> Invoke)
| * | | Fix typo (Inovke -> Invoke)Paul Hadfield2016-03-081-1/+1
|/ / /
* | | Merge pull request #731 from mattrajca/patch-1Billy Donahue2016-03-051-1/+1
|\ \ \ | |_|/ |/| | Fixed typo ('XCode' -> 'Xcode')
| * | Fixed typo ('XCode' -> 'Xcode')Matt Rajca2016-03-041-1/+1
|/ /
* | Merge pull request #719 from paul-wilkinson/docs_formatting_fixBilly Donahue2016-02-2212-17/+17
|\ \ | | | | | | Fix formatting in AdvancedGuide.md
| * | Fix formatting in AdvancedGuide.mdPaul Wilkinson2016-02-2112-17/+17
|/ / | | | | | | | | | | | | | | | | Put occurrences of "#include" in a code span so they are not interpreted as headers. Other documents were not broken because the #include was not at the start of the line, but put them in code spans anyway just in case the text gets refilled in the future.
* | Merge pull request #713 from DarthGandalf/expectBilly Donahue2016-02-177-293/+290
|\ \ | | | | | | Change error message of EXPECT_EQ to treat lhs and rhs equivalently.
| * | Change error message of EXPECT_EQ to treat lhs and rhs equivalently.Alexey Sokolov2016-02-167-293/+290
| |/
* | Merge pull request #715 from jacob-meacham/bugfix/expect-callBilly Donahue2016-02-163-8/+8
|\ \ | | | | | | Fix link that's returned when running tests. #714
| * | Fix link that's returned when running tests. #714Jacob Meacham2016-02-163-8/+8
| |/
* | Merge pull request #716 from jacob-meacham/feature/gitignoreBilly Donahue2016-02-162-0/+4
|\ \ | |/ |/| Add build artifacts to git ignore.
| * Add build artifacts to git ignore.Jacob Meacham2016-02-162-0/+4
|/
* Merge pull request #688 from tamland/python3Billy Donahue2016-02-019-29/+36
|\ | | | | Python 3 support
| * add python 3 support to fuse_gtest_files scriptThomas Amland2016-01-191-15/+18
| |
| * add python 3 support to testsThomas Amland2016-01-198-14/+18
| |
* | Merge pull request #699 from achimnol/masterBilly Donahue2016-01-312-0/+8
|\ \ | | | | | | Add tmux and tmux-256color to the colored terminal list.
| * | Add tmux and tmux-256color to the colored terminal list.Joongi Kim2016-01-312-0/+8
|/ /
* | Merge pull request #678 from pjaytycy/masterBilly Donahue2016-01-211-0/+3
|\ \ | |/ |/| Add link to Google Test Primer docs in README.md