Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Fix whitespace in paragraph | Manuel Binna | 2016-03-16 | 1 | -5/+4 | |
|/ / | ||||||
* | | Merge pull request #724 from duggelz/master | Billy Donahue | 2016-03-15 | 3 | -5/+38 | |
|\ \ | | | | | | | Read Bazel's $XML_OUTPUT_FILE environment variable | |||||
| * | | Restructure test so each scenario is independent. | Doug Greiman | 2016-03-02 | 1 | -20/+13 | |
| | | | ||||||
| * | | Fix env_var_test to ignore XML_OUTPUT_FILE if already set | Doug Greiman | 2016-03-01 | 1 | -0/+2 | |
| | | | ||||||
| * | | Restructure $XML_OUTPUT_FILE logic | Doug Greiman | 2016-02-26 | 4 | -26/+32 | |
| | | | ||||||
| * | | Fix inconsistent style | Doug Greiman | 2016-02-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | Read Bazel's $XML_OUTPUT_FILE environment variable | Doug Greiman | 2016-02-23 | 4 | -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-1 | Billy Donahue | 2016-03-08 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix typo (Inovke -> Invoke) | |||||
| * | | | Fix typo (Inovke -> Invoke) | Paul Hadfield | 2016-03-08 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #731 from mattrajca/patch-1 | Billy Donahue | 2016-03-05 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | Fixed typo ('XCode' -> 'Xcode') | |||||
| * | | Fixed typo ('XCode' -> 'Xcode') | Matt Rajca | 2016-03-04 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #719 from paul-wilkinson/docs_formatting_fix | Billy Donahue | 2016-02-22 | 12 | -17/+17 | |
|\ \ | | | | | | | Fix formatting in AdvancedGuide.md | |||||
| * | | Fix formatting in AdvancedGuide.md | Paul Wilkinson | 2016-02-21 | 12 | -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/expect | Billy Donahue | 2016-02-17 | 7 | -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 Sokolov | 2016-02-16 | 7 | -293/+290 | |
| |/ | ||||||
* | | Merge pull request #715 from jacob-meacham/bugfix/expect-call | Billy Donahue | 2016-02-16 | 3 | -8/+8 | |
|\ \ | | | | | | | Fix link that's returned when running tests. #714 | |||||
| * | | Fix link that's returned when running tests. #714 | Jacob Meacham | 2016-02-16 | 3 | -8/+8 | |
| |/ | ||||||
* | | Merge pull request #716 from jacob-meacham/feature/gitignore | Billy Donahue | 2016-02-16 | 2 | -0/+4 | |
|\ \ | |/ |/| | Add build artifacts to git ignore. | |||||
| * | Add build artifacts to git ignore. | Jacob Meacham | 2016-02-16 | 2 | -0/+4 | |
|/ | ||||||
* | Merge pull request #688 from tamland/python3 | Billy Donahue | 2016-02-01 | 9 | -29/+36 | |
|\ | | | | | Python 3 support | |||||
| * | add python 3 support to fuse_gtest_files script | Thomas Amland | 2016-01-19 | 1 | -15/+18 | |
| | | ||||||
| * | add python 3 support to tests | Thomas Amland | 2016-01-19 | 8 | -14/+18 | |
| | | ||||||
* | | Merge pull request #699 from achimnol/master | Billy Donahue | 2016-01-31 | 2 | -0/+8 | |
|\ \ | | | | | | | Add tmux and tmux-256color to the colored terminal list. | |||||
| * | | Add tmux and tmux-256color to the colored terminal list. | Joongi Kim | 2016-01-31 | 2 | -0/+8 | |
|/ / | ||||||
* | | Merge pull request #678 from pjaytycy/master | Billy Donahue | 2016-01-21 | 1 | -0/+3 | |
|\ \ | |/ |/| | Add link to Google Test Primer docs in README.md | |||||
| * | Add link to Google Test Primer docs in README.md | Pieter-Jan Busschaert | 2016-01-06 | 1 | -0/+3 | |
|/ | | | On google code, the main documentation pages were the "Google Test Primer" content. Currently it's hard to find that content on github, so add a direct link in the main README.md. | |||||
* | Merge pull request #670 from dawikur/master | Billy Donahue | 2015-12-23 | 1 | -1/+1 | |
|\ | | | | | Update GTEST_PROJECT_URL_ in internal/gtest-port.h | |||||
| * | Update GTEST_PROJECT_URL_ in internal/gtest-port.h | Dawid Kurek | 2015-12-23 | 1 | -1/+1 | |
|/ | | | | As repository moved to github. All urls need to be changed. There is still plenty to do. | |||||
* | Merge pull request #602 from mtbrandy/threadcount_aix | Billy Donahue | 2015-12-10 | 1 | -0/+18 | |
|\ | | | | | Implement GetThreadCount for AIX. | |||||
| * | Add include of sys/types.h. | Matthew Brandyberry | 2015-10-02 | 1 | -0/+1 | |
| | | ||||||
| * | Implement GetThreadCount for AIX. | Matthew Brandyberry | 2015-10-02 | 1 | -0/+17 | |
| | | ||||||
* | | Merge pull request #657 from audiofanatic/issue655-targetHeaderDeps | Billy Donahue | 2015-12-10 | 2 | -0/+16 | |
|\ \ | | | | | | | Add include dirs to targets if CMake version supports it | |||||
| * | | Add include dirs to targets if CMake version supports it | Craig Scott | 2015-12-06 | 2 | -0/+16 | |
| | | | ||||||
* | | | Merge pull request #650 from jpuigcerver/master | Billy Donahue | 2015-12-10 | 1 | -0/+8 | |
|\ \ \ | | | | | | | | | Added missing CMake install rules for GMock | |||||
| * | | | Added CMake install rules for GMock | Joan Puigcerver | 2015-12-03 | 1 | -0/+8 | |
| | | | | ||||||
* | | | | Merge pull request #660 from waynix/FixLinks | Billy Donahue | 2015-12-08 | 6 | -42/+42 | |
|\ \ \ \ | |_|/ / |/| | | | fixed link in googlemock documentation | |||||
| * | | | fixed link in googlemock documentation | Paul Rosset | 2015-12-08 | 6 | -42/+42 | |
|/ / / | ||||||
* | | | Merge pull request #654 from cmorse/doc_fix | Billy Donahue | 2015-12-04 | 16 | -159/+162 | |
|\ \ \ | |/ / |/| | | Fix lots of broken links in documentation | |||||
| * | | Fix link to FAQ in Primer.md | Caleb Morse | 2015-12-03 | 16 | -159/+162 | |
|/ / | ||||||
* | | Merge pull request #647 from mithro/patch-1 | Billy Donahue | 2015-12-02 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix AdvancedGuide link in FAQ.md | |||||
| * | | Fix AdvancedGuide link in FAQ.md | Tim Ansell | 2015-12-02 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #636 from ReadmeCritic/master | Billy Donahue | 2015-11-30 | 1 | -4/+4 | |
|\ \ | | | | | | | Update README URLs based on HTTP redirects | |||||
| * | | Update README URLs based on HTTP redirects | ReadmeCritic | 2015-11-25 | 1 | -4/+4 | |
| | | | ||||||
* | | | Merge pull request #607 from google/BillyDonahue-patch-1 | Billy Donahue | 2015-11-30 | 1 | -25/+12 | |
|\ \ \ | | | | | | | | | Update DevGuide.md | |||||
| * | | | Update DevGuide.md | Billy Donahue | 2015-10-08 | 1 | -25/+12 | |
| | | | | | | | | | | | | stop talking about subversion in the devguide. | |||||
* | | | | Merge pull request #640 from Ali-Se/patch-2 | Billy Donahue | 2015-11-30 | 1 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | Fixing some table error in file | |||||
| * | | | | Fixing some table error in file | Ali Sa'ad Eddeen | 2015-11-29 | 1 | -4/+4 | |
| | |/ / | |/| | | | | | | Some tables have missing commas inside the code that make some table cells merge, added missing commas | |||||
* | | | | Merge pull request #638 from KindDragon/patch-1 | Billy Donahue | 2015-11-30 | 1 | -50/+50 | |
|\ \ \ \ | | | | | | | | | | | Update FAQ.md | |||||
| * | | | | Update FAQ.md | Arkady Shapkin | 2015-11-28 | 1 | -50/+50 | |
| |/ / / | ||||||
* | | | | Merge pull request #592 from Ferenc-/master | Billy Donahue | 2015-11-30 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Fix typo in googlemock/README.md |