eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,042 Commits 13 Branches 14 Tags 23 MiB
f326bd27b2
Commit Graph

1042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Billy Donahue
4e940e23a4 Merge pull request #810 from google/rollback_808 
Rollback change #808.
 2016-06-26 19:09:45 -04:00
Billy Donahue
34b7cd3bf6 Rollback change #808. 2016-06-26 18:33:10 -04:00
Billy Donahue
8d6a2eec1a 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
b45748d0ab Fix to tests that return object which implement operator bool 2016-06-25 16:21:09 -05:00
David Mott
a8a1a0e041 fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that implement operator bool 2016-06-25 15:41:19 -05:00
Billy Donahue
15b52cec0d Merge pull request #773 from mazong1123/master 
Fixed googletest dir issue for building googlemock.
 2016-05-15 12:20:57 -04:00
mazong1123
3a8bc32b84 Added VS 2015 project support. 2016-05-15 21:46:38 +08:00
mazong1123
af72674db0 Updated the value of GTEST_DIR to reflect the googletest dir. 2016-05-15 21:32:56 +08:00
mazong1123
45ee7b0c46 Changed the GTestDir marco value to reflect the new dir of googletest. 2016-05-15 20:48:08 +08:00
Billy Donahue
ac04238b22 Merge pull request #741 from mbinna/patch-1 
Fix whitespace in paragraph
 2016-03-16 09:12:54 -04:00
Manuel Binna
71f7537bbc Fix whitespace in paragraph 2016-03-16 06:49:57 +01:00
Billy Donahue
f623d9b896 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
6b36c162fb Update C++ language and library settings to match SDK projects. 2016-03-11 07:58:27 -06:00
Billy Donahue
8fab1d0783 Merge pull request #735 from phad/patch-1 
Fix typo (Inovke -> Invoke)
 2016-03-08 10:52:28 -05:00
Paul Hadfield
8c79120e0e Fix typo (Inovke -> Invoke) 2016-03-08 13:40:26 +00:00
Billy Donahue
3958674f72 Merge pull request #731 from mattrajca/patch-1 
Fixed typo ('XCode' -> 'Xcode')
 2016-03-05 17:09:33 -05:00
Matt Rajca
553b8ea918 Fixed typo ('XCode' -> 'Xcode') 2016-03-04 17:20:34 -06:00
Dan Albert
3cf0535158 Fix a test to compile when tuple isn't available. 2016-03-02 15:51:28 -08:00
Doug Greiman
92ca583f01 Restructure test so each scenario is independent. 2016-03-02 12:07:42 -08:00
Doug Greiman
31bdab0dad Fix env_var_test to ignore XML_OUTPUT_FILE if already set 2016-03-01 17:44:02 -08:00
Doug Greiman
9c99ed9211 Restructure $XML_OUTPUT_FILE logic 2016-02-26 14:26:23 -08:00
Doug Greiman
1862e3a14e Fix inconsistent style 2016-02-25 19:03:46 -08:00
Don Huff
f40c519708 Add missing headers to Xcode framework target. 2016-02-25 10:09:16 -06:00
Doug Greiman
3ac6a7bdd8 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
aaa45ef055 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
054ec981bc Fix compilation on MinGW with native threads 2016-02-22 14:07:12 -08:00
Billy Donahue
8506e45495 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
55a7cefa4f 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
967e5ac282 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
4a59d57291 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
9eb054ea5e 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
df092f4fc7 Fix link that's returned when running tests. #714 2016-02-16 17:53:43 -08:00
Jacob Meacham
d46995bd77 Add build artifacts to git ignore. 2016-02-16 17:46:14 -08:00
Alexey Sokolov
ded55add57 Change error message of EXPECT_EQ to treat lhs and rhs equivalently. 2016-02-16 23:32:01 +00:00
Billy Donahue
c466676be6 Merge pull request #688 from tamland/python3 
Python 3 support
 2016-02-01 09:41:10 -05:00
Billy Donahue
b05b0955ea 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
6140c7ff77 Add tmux and tmux-256color to the colored terminal list. 2016-01-31 17:24:31 +09:00
Billy Donahue
9bbd9de898 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
4c14cbee98 add python 3 support to fuse_gtest_files script 2016-01-19 14:41:22 +01:00
Thomas Amland
d0ecbd70c8 add python 3 support to tests 2016-01-19 14:41:20 +01:00
Pieter-Jan Busschaert
6abc0fa7dc 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
54f4bac383 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
94a6279d3f 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
c98abc64cb Merge pull request #602 from mtbrandy/threadcount_aix 
Implement GetThreadCount for AIX.
 2015-12-10 17:29:15 -05:00
Billy Donahue
a50a6e2921 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
40b882e16f Merge pull request #650 from jpuigcerver/master 
Added missing CMake install rules for GMock
 2015-12-10 17:25:53 -05:00
Billy Donahue
daff5b4026 Merge pull request #660 from waynix/FixLinks 
fixed link in googlemock documentation
 2015-12-08 10:58:04 -05:00
Paul Rosset
13deb0898d fixed link in googlemock documentation 2015-12-08 16:02:50 +01:00
Craig Scott
ad1023eb63 Add include dirs to targets if CMake version supports it 2015-12-06 16:31:21 +11:00
Billy Donahue
abbc2452d2 Merge pull request #654 from cmorse/doc_fix 
Fix lots of broken links in documentation
 2015-12-04 00:18:09 -05:00