Commit Graph

916 Commits

Author SHA1 Message Date
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
Ali Sa'ad Eddeen
25409abfe7 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
83b93eac3b Update FAQ.md 2015-11-28 17:59:51 +03:00
ReadmeCritic
3aef7d7ddd Update README URLs based on HTTP redirects 2015-11-25 08:25:03 -08:00
Billy Donahue
ffce1a8578 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
f44190f2c4 Fix missing-field-initializers GCC/Clang warning (issue 433). 2015-11-24 10:45:16 -08:00
Billy Donahue
93c37d59b0 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
884dd08d73 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
c4c23548a1 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
98d988deac Add CMake install rules for gtest libraries and headers 2015-11-23 16:53:09 -05:00
Billy Donahue
786564fa4a 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
Mark Mentovai
4a8e54401e Name the helper AsBits() 2015-11-12 10:01:06 -05:00
Mark Mentovai
cfe466a0a7 Use a templated helper to wrap the cast
The helper needs to be templated because its argument type can’t be
known. FloatingPointTest is instantiated with RawType = float and
RawType = double, so Bits will be an unsigned 32-bit or 64-bit type.
size_t will be either 32 or 64 bits depending on the system’s
definition, typically based on pointer size.
2015-11-11 18:26:35 -05:00
Mark Mentovai
cbce23fb86 Leave decltype(max_ulps_) alone and cast, not sure this is better 2015-11-11 17:44:12 -05:00
Mark Mentovai
322a4914a3 Better use of character constants 2015-11-11 17:40:52 -05:00
Fábio Junqueira
4a0b77ff72 Create CMakeLists.txt
Adding functionality to build googletest from the root directory
2015-11-11 18:29:41 -02:00
Mark Mentovai
8b085f0d21 Fix warnings encountered in MSVC build of gtest/gmock tests
This fixes these warnings:

…\gtest\googletest\test\gtest-port_test.cc(78) : error C2220: warning treated as error - no 'object' file generated
…\gtest\googletest\test\gtest-port_test.cc(78) : warning C4309: 'static_cast' : truncation of constant value
…\gtest\googletest\test\gtest-port_test.cc(79) : warning C4309: 'static_cast' : truncation of constant value

…\gtest\googlemock\test\gmock-matchers_test.cc(2712) : error C2220: warning treated as error - no 'object' file generated
        …\gtest\googlemock\test\gmock-matchers_test.cc(2706) : while compiling class template member function 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)'
        …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to function template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)' being compiled
        …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to class template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>' being compiled
…\gtest\googlemock\test\gmock-matchers_test.cc(2712) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2714) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2716) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2717) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2718) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2721) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2723) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
2015-11-11 12:28:15 -05:00
Billy Donahue
71a26ac68b Merge pull request #612 from mark-chromium/gmock_rtti
googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
2015-11-10 17:48:26 -05:00