Commit Graph

973 Commits

Author SHA1 Message Date
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
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
Caleb Morse
fa1958d16d Fix link to FAQ in Primer.md 2015-12-03 21:23:56 -05:00
Joan Puigcerver
dd058df9e2 Added CMake install rules for GMock 2015-12-03 09:33:21 +01:00
Billy Donahue
b591f9d9b3 Merge pull request #647 from mithro/patch-1
Fix AdvancedGuide link in FAQ.md
2015-12-02 12:35:35 -05:00
Tim Ansell
a70daf7a51 Fix AdvancedGuide link in FAQ.md 2015-12-02 13:27:36 +11:00
Billy Donahue
5f91841f33 Merge pull request #636 from ReadmeCritic/master
Update README URLs based on HTTP redirects
2015-11-30 14:06:12 -05:00
Billy Donahue
2dbf3e6e91 Merge pull request #607 from google/BillyDonahue-patch-1
Update DevGuide.md
2015-11-30 14:05:44 -05:00
Billy Donahue
0a829769c4 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
22539acc6d Merge pull request #638 from KindDragon/patch-1
Update FAQ.md
2015-11-30 14:00:48 -05:00
Billy Donahue
4a6c17a6be Merge pull request #592 from Ferenc-/master
Fix typo in googlemock/README.md
2015-11-30 13:49:47 -05:00
Ali Sa'ad Eddeen
28ebeffe98 Fixing some table error in file
Some tables have missing commas inside the code that make some table cells merge, added missing commas
2015-11-29 23:25:06 +04:00
Arkady Shapkin
9231fe511e Update FAQ.md 2015-11-28 17:59:51 +03:00
ReadmeCritic
9c04275e7b Update README URLs based on HTTP redirects 2015-11-25 08:25:03 -08:00
Billy Donahue
cb73e4a63e Merge pull request #633 from plopresti/master
Fix missing-field-initializers GCC/Clang warning (issue 433).
2015-11-24 13:51:39 -05:00
Patrick J. LoPresti
a52c2daa73 Fix missing-field-initializers GCC/Clang warning (issue 433). 2015-11-24 10:45:16 -08:00
Billy Donahue
06838c3724 Merge pull request #632 from nocnokneo/add-cmake-install-rules
Add CMake install rules for gtest libraries and headers
2015-11-24 10:35:59 -05:00
Billy Donahue
0f8d3aeeae Merge pull request #628 from fjunqueira/patch-1
Adding CMakeLists.txt to the root dir
2015-11-24 10:35:34 -05:00
Billy Donahue
fd536cd75d Merge pull request #614 from DukeXar/master
Fix C++11 clang builds in Travis CI
2015-11-24 10:34:13 -05:00
Taylor Braun-Jones
4450609201 Add CMake install rules for gtest libraries and headers 2015-11-23 16:53:09 -05:00
Billy Donahue
e64fdc9dc7 Merge pull request #627 from mark-chromium/tests_msvs
Fix warnings encountered in MSVC build of gtest/gmock tests
2015-11-23 10:10:53 -05:00