aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* Remove /tree/ from Readme.md links.Billy Donahue2017-02-251-4/+4
| | | Issue #1028
* Merge pull request #1 from google/masterSam Roth2017-01-233-2/+12
|\ | | | | Syncing my branch
| * Merge pull request #658 from audiofanatic/ExternalProject_at_configure_timeBilly Donahue2016-12-181-0/+10
| |\ | | | | | | Added docs for ExternalProject download during CMake step
| | * Added CMake configure-time download instructions to docsCraig Scott2016-12-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds instructions for how to add gtest and gmock to another CMake project directly. Downloading of the googletest sources happens as configure time, allowing it to be added to the main build directly via the add_subdirectory() command. This ensures googletest is built with the same compiler settings, etc. and will typically result in a more robust and more convenient build arrangement.
| * | 2.6.4 is the minimum CMake version, so enforce it (#656)Craig Scott2016-12-171-1/+1
| |/
| * Cookbok: fix broken relative linkMarco Molteni2016-09-131-1/+1
| |
* | Fixed broken linksSamuel Roth2016-09-121-1/+1
| |
* | blob vs treeSamuel Roth2016-09-121-1/+1
| |
* | Fixing relative linksSamuel Roth2016-09-121-2/+2
| |
* | Fixing KnownIssues and FrequentlyAskedQuestions linksSamuel Roth2016-09-121-2/+2
| |
* | Broken relative links fixedSamuel Roth2016-09-121-6/+6
| |
* | Fixing ForDummies linkSamuel Roth2016-09-121-1/+1
| |
* | One worksSamuel Roth2016-09-121-1/+1
| |
* | Relative linksSamuel Roth2016-09-121-1/+1
| |
* | Fixing relative linksSamuel Roth2016-09-121-1/+1
|/
* Reformatted the Unprintable operator== code style.mazong11232016-07-141-1/+4
|
* Fixed issue #775mazong11232016-07-141-2/+3
|
* Added VS 2015 project support.mazong11232016-05-155-0/+328
|
* Updated the value of GTEST_DIR to reflect the googletest dir.mazong11232016-05-151-1/+1
|
* Changed the GTestDir marco value to reflect the new dir of googletest.mazong11232016-05-152-2/+2
|
* Fix typo (Inovke -> Invoke)Paul Hadfield2016-03-081-1/+1
|
* Fix formatting in AdvancedGuide.mdPaul Wilkinson2016-02-214-4/+4
| | | | | | | | | 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.
* Fix link that's returned when running tests. #714Jacob Meacham2016-02-163-8/+8
|
* Merge pull request #657 from audiofanatic/issue655-targetHeaderDepsBilly Donahue2015-12-101-0/+8
|\ | | | | Add include dirs to targets if CMake version supports it
| * Add include dirs to targets if CMake version supports itCraig Scott2015-12-061-0/+8
| |
* | Merge pull request #650 from jpuigcerver/masterBilly Donahue2015-12-101-0/+8
|\ \ | | | | | | Added missing CMake install rules for GMock
| * | Added CMake install rules for GMockJoan Puigcerver2015-12-031-0/+8
| |/
* / fixed link in googlemock documentationPaul Rosset2015-12-086-42/+42
|/
* Merge pull request #592 from Ferenc-/masterBilly Donahue2015-11-301-1/+1
|\ | | | | Fix typo in googlemock/README.md
| * Fix typo in googlemock/README.mdFerenc-2015-09-191-1/+1
| |
* | Name the helper AsBits()Mark Mentovai2015-11-121-11/+10
| |
* | Use a templated helper to wrap the castMark Mentovai2015-11-111-14/+15
| | | | | | | | | | | | | | | | 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.
* | Leave decltype(max_ulps_) alone and cast, not sure this is betterMark Mentovai2015-11-111-12/+14
| |
* | Fix warnings encountered in MSVC build of gtest/gmock testsMark Mentovai2015-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #612 from mark-chromium/gmock_rttiBilly Donahue2015-11-101-4/+4
|\ \ | | | | | | googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
| * | googlemock: Disable WhenDynamicCastToTest tests when RTTI is offMark Mentovai2015-10-121-4/+4
| | | | | | | | | | | | https://github.com/google/googletest/issues/610
* | | googlemock: Support C++11 language with pre-C++11 libraryMark Mentovai2015-10-123-10/+10
|/ / | | | | | | | | | | This guards use of <type_traits> and its features with GTEST_HAS_STD_TYPE_TRAITS_, and std::function with GTEST_HAS_STD_FUNCTION_.
* | Fix broken link to FrequentlyAskedQuestionsMarco Molteni2015-09-231-1/+1
| |
* | Adding missing files to googlemock distribution.Martin Maly2015-09-191-2/+6
|/
* Fix relative links in googlemock docs.Billy Donahue2015-09-171-4/+4
|
* Fix the googlemock autotools build.Simon Newton2015-09-173-11/+10
|
* Include <memory> to use std::unique_ptr.Billy Donahue2015-09-081-0/+1
|
* Googlemock has some tuples containing lvalue refs in its unit tests.Billy Donahue2015-09-072-5/+9
| | | | | | | | | | | | | | | These tuples are created with make_tuple, which is given temporaries. The make_tuple is in a function argument list. A possibly overzealous static_assert in libc++'s std::tuple ctor is firing in our 'Perform(make_tuple("hi"))' calls, so we can't use its make_tuple here. Instead we will use explicitly-constructed tuples constructed from non-temporary strings. Workaround for llvm bug: https://llvm.org/bugs/show_bug.cgi?id=20855 An alternative to https://github.com/google/googletest/pull/580 .
* mergeBilly Donahue2015-08-302-8/+8
|\
| * Fix gmock_doctor.py for Python3Syl2015-08-301-7/+7
| |
| * googlemock: fix unified buildArnaud Lacombe2015-08-261-1/+1
| |
* | readme mergingBilly Donahue2015-08-301-7/+54
| |
* | readme mergingBilly Donahue2015-08-261-67/+30
| |
* | readme mergingBilly Donahue2015-08-261-59/+32
|/
* move ProjectHome files into rootBilly Donahue2015-08-251-65/+0
|