Billy Donahue
48ee8e98ab
Merge pull request #856 from KindDragon/mingw-appveyor
...
Fix Mingw-w64 build
2016-09-07 14:48:12 -04:00
Arkadiy Shapkin
d8fe70f477
Fix build with MinGW-w64
2016-09-05 00:57:49 +03:00
Marzo Sette Torres Junior
f700442db3
Clarifying language
...
The old language might mislead someone into thinking that the access level on the base class itself was changed.
2016-09-02 14:39:48 -03:00
tommyleo2
82396f2d54
Update Primer.md
...
fix bug in string comparison assertions table where _str2_ is mistakenly written as _str_2
2016-09-02 19:45:48 +08:00
Claus Stovgaard
68f19facc2
Moved the ignoring of *.pyc files to top level for also covering googlemock python scripts.
2016-08-30 16:15:46 +02:00
Arkady Shapkin
1cff1460d1
Add links to IRC channel and Google Group
2016-08-24 22:47:34 +03:00
Billy Donahue
ed9d1e1ff9
Merge pull request #721 from ilmagico/fix-mingw-threads
...
Fix compilation of googletest with MinGW using Win32 threads
2016-08-24 08:15:38 -04:00
Billy Donahue
ec44c6c167
Merge pull request #821 from mazong1123/master
...
Fixed issue #775 . Mark the ConvertibleFromAny constructor as explicit, and fix operator overload issue for Unprintable
2016-07-14 13:15:38 -04:00
mazong1123
dc2dbf1fbf
Reformatted the Unprintable operator== code style.
2016-07-14 16:49:42 +08:00
mazong1123
531bf5c410
Fixed issue #775
2016-07-14 14:09:05 +08:00
Billy Donahue
d406cb18c3
Merge pull request #814 from google/BillyDonahue-patch-2
...
Add Appveyor badge to Readme.md
2016-06-28 22:27:12 -04:00
Billy Donahue
e51026e5d1
Add Appveyor badge to Readme.md
2016-06-28 22:26:30 -04:00
Billy Donahue
8134585072
Merge pull request #723 from KindDragon/master
...
Run MSVC tests on AppVeyor
2016-06-28 10:47:48 -04:00
Arkadiy Shapkin
43c0ae3375
Support running MSVC build on AppVeyour
2016-06-27 11:40:27 +03:00
Billy Donahue
10799abad2
Merge pull request #810 from google/rollback_808
...
Rollback change #808 .
2016-06-26 19:09:45 -04:00
Billy Donahue
ce7ec96eda
Rollback change #808 .
2016-06-26 18:33:10 -04:00
Billy Donahue
faee7d1fbc
Merge pull request #808 from djmott/master
...
fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions th…
2016-06-26 11:15:54 -04:00
David Mott
2489c30747
Fix to tests that return object which implement operator bool
2016-06-25 16:21:09 -05:00
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
Tobias Markus
08d76be4cc
Performance fixes reported by cppcheck
2016-05-22 18:35:52 +02:00
Manuel Vives
a7ab054f2b
Issue 709: Fix Cmake policy 0048
2016-05-21 20:18:32 -04: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
Li Peng
266a185a52
remove duplicated words
...
Signed-off-by: Li Peng <lip@dtdream.com>
2016-04-27 16:41:27 +08:00
Nic Holthaus
1d1b306dd4
made capitalization more consistent with other projects.
2016-03-26 19:45:11 -04:00
Nic Holthaus
c88525f3f0
added related open source project
...
Added a link to [gtest-runner](https://github.com/nholthaus/gtest-runner ), which is a Qt GUI for gtest executables. It just had its initial release, and is being actively developed and tested on multiple linux and windows platforms.
2016-03-26 19:38:55 -04: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
Don Huff
d254052f7f
Update C++ language and library settings to match SDK projects.
2016-03-11 07:58:27 -06: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
Dan Albert
3429113886
Fix a test to compile when tuple isn't available.
2016-03-02 15:51:28 -08: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
Don Huff
407b0aaf85
Add missing headers to Xcode framework target.
2016-02-25 10:09:16 -06: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
Daniele Tamino
a138385e48
Don't use pthread when on MinGW even if available
...
It's not supported, and native Windows threading is available for MinGW
2016-02-22 14:07:12 -08:00
Daniele Tamino
9759dcda3c
Fix compilation on MinGW with native threads
2016-02-22 14:07:12 -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