David Mott
e35015f539
fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that implement operator bool
2016-06-25 15:41:19 -05:00
Billy Donahue
0a439623f7
Merge pull request #773 from mazong1123/master
...
Fixed googletest dir issue for building googlemock.
2016-05-15 12:20:57 -04:00
mazong1123
5bae126d66
Added VS 2015 project support.
2016-05-15 21:46:38 +08:00
mazong1123
01f3d09f9f
Updated the value of GTEST_DIR to reflect the googletest dir.
2016-05-15 21:32:56 +08:00
mazong1123
2746b57f78
Changed the GTestDir marco value to reflect the new dir of googletest.
2016-05-15 20:48:08 +08:00
Billy Donahue
d225acc90b
Merge pull request #741 from mbinna/patch-1
...
Fix whitespace in paragraph
2016-03-16 09:12:54 -04:00
Manuel Binna
207147495c
Fix whitespace in paragraph
2016-03-16 06:49:57 +01:00
Billy Donahue
72416fab75
Merge pull request #724 from duggelz/master
...
Read Bazel's $XML_OUTPUT_FILE environment variable
2016-03-15 18:20:27 -04:00
Billy Donahue
eba1796310
Merge pull request #735 from phad/patch-1
...
Fix typo (Inovke -> Invoke)
2016-03-08 10:52:28 -05:00
Paul Hadfield
0098be394a
Fix typo (Inovke -> Invoke)
2016-03-08 13:40:26 +00:00
Billy Donahue
f7248d80ea
Merge pull request #731 from mattrajca/patch-1
...
Fixed typo ('XCode' -> 'Xcode')
2016-03-05 17:09:33 -05:00
Matt Rajca
62700bdf56
Fixed typo ('XCode' -> 'Xcode')
2016-03-04 17:20:34 -06:00
Doug Greiman
d23cf2b157
Restructure test so each scenario is independent.
2016-03-02 12:07:42 -08:00
Doug Greiman
6991f422b6
Fix env_var_test to ignore XML_OUTPUT_FILE if already set
2016-03-01 17:44:02 -08:00
Doug Greiman
5db9cbbc23
Restructure $XML_OUTPUT_FILE logic
2016-02-26 14:26:23 -08:00
Doug Greiman
12b2f23e8e
Fix inconsistent style
2016-02-25 19:03:46 -08:00
Doug Greiman
d6790f26ca
Read Bazel's $XML_OUTPUT_FILE environment variable
...
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.
2016-02-23 18:50:08 -08:00
Billy Donahue
ff07a5de0e
Merge pull request #719 from paul-wilkinson/docs_formatting_fix
...
Fix formatting in AdvancedGuide.md
2016-02-22 00:34:32 -05:00
Paul Wilkinson
83d3b47acf
Fix formatting in AdvancedGuide.md
...
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.
2016-02-21 15:52:09 +00:00
Billy Donahue
77d6b17338
Merge pull request #713 from DarthGandalf/expect
...
Change error message of EXPECT_EQ to treat lhs and rhs equivalently.
2016-02-17 16:32:41 -05:00
Billy Donahue
5909d44d34
Merge pull request #715 from jacob-meacham/bugfix/expect-call
...
Fix link that's returned when running tests. #714
2016-02-16 22:34:26 -05:00
Billy Donahue
f5acf22268
Merge pull request #716 from jacob-meacham/feature/gitignore
...
Add build artifacts to git ignore.
2016-02-16 22:32:55 -05:00
Jacob Meacham
d4aa34b05d
Fix link that's returned when running tests. #714
2016-02-16 17:53:43 -08:00
Jacob Meacham
b648a30721
Add build artifacts to git ignore.
2016-02-16 17:46:14 -08:00
Alexey Sokolov
f364e18837
Change error message of EXPECT_EQ to treat lhs and rhs equivalently.
2016-02-16 23:32:01 +00:00
Billy Donahue
ff5ffd457e
Merge pull request #688 from tamland/python3
...
Python 3 support
2016-02-01 09:41:10 -05:00
Billy Donahue
a9b73f8139
Merge pull request #699 from achimnol/master
...
Add tmux and tmux-256color to the colored terminal list.
2016-01-31 16:55:53 -05:00
Joongi Kim
340c6b3375
Add tmux and tmux-256color to the colored terminal list.
2016-01-31 17:24:31 +09:00
Billy Donahue
82b11b8cfc
Merge pull request #678 from pjaytycy/master
...
Add link to Google Test Primer docs in README.md
2016-01-21 14:08:55 -05:00
Thomas Amland
456fc2b5c4
add python 3 support to fuse_gtest_files script
2016-01-19 14:41:22 +01:00
Thomas Amland
d404af0d98
add python 3 support to tests
2016-01-19 14:41:20 +01:00
Pieter-Jan Busschaert
d8df1fb488
Add link to Google Test Primer docs in README.md
...
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.
2016-01-06 16:48:58 +01:00
Billy Donahue
13206d6f53
Merge pull request #670 from dawikur/master
...
Update GTEST_PROJECT_URL_ in internal/gtest-port.h
2015-12-23 07:57:42 -05:00
Dawid Kurek
ac35fe7359
Update GTEST_PROJECT_URL_ in internal/gtest-port.h
...
As repository moved to github. All urls need to be changed. There is
still plenty to do.
2015-12-23 09:49:14 +01:00
Billy Donahue
ddb8012eb4
Merge pull request #602 from mtbrandy/threadcount_aix
...
Implement GetThreadCount for AIX.
2015-12-10 17:29:15 -05:00
Billy Donahue
0162ff72e8
Merge pull request #657 from audiofanatic/issue655-targetHeaderDeps
...
Add include dirs to targets if CMake version supports it
2015-12-10 17:28:00 -05:00
Billy Donahue
c1cd9c2b05
Merge pull request #650 from jpuigcerver/master
...
Added missing CMake install rules for GMock
2015-12-10 17:25:53 -05:00
Billy Donahue
57b376a9cb
Merge pull request #660 from waynix/FixLinks
...
fixed link in googlemock documentation
2015-12-08 10:58:04 -05:00
Paul Rosset
a470862dbe
fixed link in googlemock documentation
2015-12-08 16:02:50 +01:00
Craig Scott
f601ee162e
Add include dirs to targets if CMake version supports it
2015-12-06 16:31:21 +11:00
Billy Donahue
35fb11efbe
Merge pull request #654 from cmorse/doc_fix
...
Fix lots of broken links in documentation
2015-12-04 00:18:09 -05:00
Caleb Morse
ebd1d0887c
Fix link to FAQ in Primer.md
2015-12-03 21:23:56 -05:00
Joan Puigcerver
7c8ac4886a
Added CMake install rules for GMock
2015-12-03 09:33:21 +01:00
Billy Donahue
1f8fe13618
Merge pull request #647 from mithro/patch-1
...
Fix AdvancedGuide link in FAQ.md
2015-12-02 12:35:35 -05:00
Tim Ansell
16b9bbc3ef
Fix AdvancedGuide link in FAQ.md
2015-12-02 13:27:36 +11:00
Billy Donahue
2f93e2d808
Merge pull request #636 from ReadmeCritic/master
...
Update README URLs based on HTTP redirects
2015-11-30 14:06:12 -05:00
Billy Donahue
6fe019e6b7
Merge pull request #607 from google/BillyDonahue-patch-1
...
Update DevGuide.md
2015-11-30 14:05:44 -05:00
Billy Donahue
3c3a4ac2c2
Merge pull request #640 from Ali-Se/patch-2
...
Fixing some table error in file
2015-11-30 14:01:33 -05:00
Billy Donahue
96bba4d5c1
Merge pull request #638 from KindDragon/patch-1
...
Update FAQ.md
2015-11-30 14:00:48 -05:00
Billy Donahue
ccd0f94e82
Merge pull request #592 from Ferenc-/master
...
Fix typo in googlemock/README.md
2015-11-30 13:49:47 -05:00
