Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #612 from mark-chromium/gmock_rtti | Billy Donahue | 2015-11-10 | 1 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | googlemock: Disable WhenDynamicCastToTest tests when RTTI is off | |||||
| * | | | | googlemock: Disable WhenDynamicCastToTest tests when RTTI is off | Mark Mentovai | 2015-10-12 | 1 | -4/+4 | |
| |/ / / | | | | | | | | | | | | | https://github.com/google/googletest/issues/610 | |||||
* | | | | Merge pull request #611 from mark-chromium/gmock_cxx11 | Billy Donahue | 2015-11-10 | 4 | -11/+12 | |
|\ \ \ \ | | | | | | | | | | | googlemock: Support C++11 language with pre-C++11 library | |||||
| * | | | | googlemock: Support C++11 language with pre-C++11 library | Mark Mentovai | 2015-10-12 | 4 | -11/+12 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | This guards use of <type_traits> and its features with GTEST_HAS_STD_TYPE_TRAITS_, and std::function with GTEST_HAS_STD_FUNCTION_. | |||||
* | | | | Merge pull request #605 from d-meiser/fix-visibility-hidden | Billy Donahue | 2015-10-29 | 3 | -4/+14 | |
|\ \ \ \ | | | | | | | | | | | Fix building of gtest with -fvisibility=hidden [#451] | |||||
| * | | | | Fix symbol visibility of StreamingListener. | Dominic Meiser | 2015-10-29 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Add an option to enable building with -fvisibility=hidden. | Dominic Meiser | 2015-10-29 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this option is set gtest itself is built with -fvisibility=hidden with gcc and clang. This replicates MSVC's default behaviour with gcc and clang. | |||||
| * | | | | Fix definition of GTEST_API_ macro for gcc and clang [#451]. | Dominic Meiser | 2015-10-29 | 1 | -3/+3 | |
|/ / / / | | | | | | | | | | | | | This is to enable using gtest with -fvisibility=hidden. | |||||
* | | | | Merge pull request #616 from anuragsoni/documentation/fix-readme-for-googletest | Billy Donahue | 2015-10-19 | 1 | -2/+2 | |
|\ \ \ \ | |/ / / |/| | | | update googletest readme to fix broken links | |||||
| * | | | update googletest readme to fix broken links | Anurag Soni | 2015-10-19 | 1 | -2/+2 | |
|/ / / | ||||||
* | | | Merge pull request #604 from marco-m/urls-should-go-to-github | Billy Donahue | 2015-10-04 | 1 | -22/+22 | |
|\ \ \ | |_|/ |/| | | Fix URLs in documentation (point to github, relative links) | |||||
| * | | Fix relative links in documentation | Marco Molteni | 2015-10-04 | 1 | -8/+8 | |
| | | | ||||||
| * | | Update URLs from googlecode to github | Marco Molteni | 2015-10-04 | 1 | -16/+16 | |
|/ / | ||||||
* | | Merge pull request #597 from marco-m/patch-1 | Billy Donahue | 2015-09-23 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix broken link to FrequentlyAskedQuestions | |||||
| * | | Fix broken link to FrequentlyAskedQuestions | Marco Molteni | 2015-09-23 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #594 from martinmaly/gmock | Billy Donahue | 2015-09-20 | 1 | -2/+6 | |
|\ \ | | | | | | | Adding missing files to googlemock distribution. | |||||
| * | | Adding missing files to googlemock distribution. | Martin Maly | 2015-09-19 | 1 | -2/+6 | |
| |/ | ||||||
* | | Merge pull request #593 from martinmaly/distcheck | Billy Donahue | 2015-09-20 | 1 | -1/+5 | |
|\ \ | |/ |/| | Adding missing header files to the distribution. | |||||
| * | Adding missing header files to the distribution. | Martin Maly | 2015-09-19 | 1 | -1/+5 | |
|/ | ||||||
* | Merge pull request #591 from google/BillyDonahue-patch-1 | Billy Donahue | 2015-09-17 | 1 | -4/+4 | |
|\ | | | | | Fix relative links in googlemock docs. | |||||
| * | Fix relative links in googlemock docs. | Billy Donahue | 2015-09-17 | 1 | -4/+4 | |
|/ | ||||||
* | Merge pull request #589 from nomis52/master | Billy Donahue | 2015-09-17 | 3 | -11/+10 | |
|\ | | | | | Fix the googlemock autotools build. | |||||
| * | Fix the googlemock autotools build. | Simon Newton | 2015-09-17 | 3 | -11/+10 | |
|/ | ||||||
* | Merge pull request #585 from orgads/warning-fix | Billy Donahue | 2015-09-09 | 1 | -0/+2 | |
|\ | | | | | Fix unused static variable warning on Windows | |||||
| * | Fix unused static variable warning on Windows | Orgad Shaneh | 2015-09-09 | 1 | -0/+2 | |
|/ | ||||||
* | Include <memory> to use std::unique_ptr. | Billy Donahue | 2015-09-08 | 1 | -0/+1 | |
| | ||||||
* | Googlemock has some tuples containing lvalue refs in its unit tests. | Billy Donahue | 2015-09-07 | 2 | -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 . | |||||
* | Merge pull request #579 from daus-salar/patch-1 | Billy Donahue | 2015-09-07 | 1 | -1/+2 | |
|\ | | | | | FIX add missing blank line between text and table | |||||
| * | FIX add missing blank line between text and table | Daus Salar | 2015-09-05 | 1 | -1/+2 | |
| | | | | | | The markdown interpreter don't interpret the table otherwise. | |||||
* | | Merge pull request #582 from dmircevski/build-c++11 | Billy Donahue | 2015-09-07 | 2 | -0/+2 | |
|\ \ | |/ |/| | Add c++11 build to the Travis matrix. | |||||
| * | Add c++11 build to the Travis matrix. | deki | 2015-09-07 | 2 | -0/+2 | |
|/ | ||||||
* | Merge pull request #578 from BillyDonahue/upstream_master | Billy Donahue | 2015-09-01 | 1 | -2/+2 | |
|\ | | | | | build once | |||||
| * | build once | Billy Donahue | 2015-09-01 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #577 from BillyDonahue/upstream_master | Billy Donahue | 2015-09-01 | 2 | -7/+12 | |
|\| | | | | | run tests in Travis CI | |||||
| * | run tests | Billy Donahue | 2015-09-01 | 2 | -27/+13 | |
| |\ | |/ |/| | ||||||
* | | Merge branch 'travis' | Billy Donahue | 2015-09-01 | 0 | -0/+0 | |
|\ \ | | | | | | | | | | | | | Conflicts: travis.sh | |||||
| * | | run tests in Travis CI | Billy Donahue | 2015-09-01 | 1 | -7/+7 | |
| | | | ||||||
* | | | break out test and mock in travis | Billy Donahue | 2015-08-31 | 1 | -1/+1 | |
| | | | ||||||
* | | | break out test and mock in travis | Billy Donahue | 2015-08-31 | 2 | -9/+9 | |
| | | | ||||||
* | | | cleanup travis.sh | Billy Donahue | 2015-08-31 | 1 | -25/+7 | |
| | | | ||||||
* | | | remove unused valgrind probe | Billy Donahue | 2015-08-31 | 1 | -1/+0 | |
|/ / | ||||||
| * | reduce the ci matrix | Billy Donahue | 2015-09-01 | 1 | -1/+1 | |
| | | ||||||
| * | restore test running | Billy Donahue | 2015-09-01 | 1 | -7/+7 | |
|/ | ||||||
* | travis update | Billy Donahue | 2015-08-31 | 1 | -14/+9 | |
| | ||||||
* | Merge branch 'master' of github.com:google/googletest into travis | Billy Donahue | 2015-08-31 | 1 | -0/+2 | |
|\ | ||||||
| * | Update README.md | Billy Donahue | 2015-08-31 | 1 | -0/+2 | |
| | | ||||||
| * | Merge pull request #575 from BillyDonahue/master | Billy Donahue | 2015-08-31 | 2 | -0/+72 | |
| |\ | | | | | | | travis continuous integration | |||||
* | \ | Merge branch 'master' of github.com:BillyDonahue/googletest into travis | Billy Donahue | 2015-08-31 | 0 | -0/+0 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge pull request #1 from BillyDonahue/travis | Billy Donahue | 2015-08-31 | 2 | -0/+72 | |
| |\ \ | | |/ | |/| | travis config | |||||
* | | | travis googlemock as well | Billy Donahue | 2015-08-31 | 2 | -7/+11 | |
| | | |