Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1029 from google/BillyDonahue-patch-3 | Billy Donahue | 2017-02-26 | 1 | -4/+4 |
|\ | | | | | Remove /tree/ from Readme.md links. | ||||
| * | Remove /tree/ from Readme.md links.refs/pull/1029/head | Billy Donahue | 2017-02-26 | 1 | -4/+4 |
|/ | | | Issue #1028 | ||||
* | Merge pull request #996 from srz-zumix/fix-error | Billy Donahue | 2017-02-17 | 1 | -1/+1 |
|\ | | | | | fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/ | ||||
| * | fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/refs/pull/996/head | srz_zumix | 2017-02-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #982 from mbjorge/unused-variable-fix | Billy Donahue | 2017-01-31 | 1 | -3/+4 |
|\ | | | | | Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_P | ||||
| * | Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_Prefs/pull/982/head | Mike Bjorge | 2017-01-10 | 1 | -3/+4 |
| | | | | | | | | | | | | If REGISTER_TYPED_TEST_CASE_P is included in a header file, but the .cc file does not declare INSTANTIATE_TYPED_TEST_CASE_P, an unused-variable warning may be raised by the compiler. | ||||
* | | Merge pull request #874 from sejr/master | Billy Donahue | 2017-01-23 | 1 | -6/+6 |
|\ \ | |/ |/| | Fixing broken relative links in Google Mock documentation | ||||
| * | Merge pull request #1 from google/masterrefs/pull/874/head | Sam Roth | 2017-01-23 | 8 | -8/+127 |
| |\ | |/ |/| | Syncing my branch | ||||
* | | Merge pull request #658 from audiofanatic/ExternalProject_at_configure_time | Billy Donahue | 2016-12-18 | 2 | -2/+115 |
|\ \ | | | | | | | Added docs for ExternalProject download during CMake step | ||||
| * | | Added CMake configure-time download instructions to docsrefs/pull/658/head | Craig Scott | 2016-12-17 | 2 | -2/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Scott | 2016-12-18 | 3 | -3/+3 |
|/ / | |||||
* | | Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONE | Billy Donahue | 2016-11-03 | 1 | -2/+6 |
|\ \ | | | | | | | Fix detection of GTEST_HAS_CLONE for Android. | ||||
| * | | Fix detection of GTEST_HAS_CLONE for Android.refs/pull/918/head | Dan Albert | 2016-11-01 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | This was not in Gingerbread for anything but ARM (even though the libs were hacked to lie about it being available in gingerbread). | ||||
* | | | Merge pull request #728 from DanAlbert/tuple-stlport | Billy Donahue | 2016-11-02 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Fix a test to compile when tuple isn't available. | ||||
| * | | | Fix a test to compile when tuple isn't available.refs/pull/728/head | Dan Albert | 2016-03-02 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #876 from marco-m/patch-1 | Billy Donahue | 2016-09-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | mock cookbook: fix broken relative link | ||||
| * | | | Cookbok: fix broken relative linkrefs/pull/876/head | Marco Molteni | 2016-09-13 | 1 | -1/+1 |
|/ / / | |||||
| | * | Fixed broken links | Samuel Roth | 2016-09-12 | 1 | -1/+1 |
| | | | |||||
| | * | blob vs tree | Samuel Roth | 2016-09-12 | 1 | -1/+1 |
| | | | |||||
| | * | Fixing relative links | Samuel Roth | 2016-09-12 | 1 | -2/+2 |
| | | | |||||
| | * | Fixing KnownIssues and FrequentlyAskedQuestions links | Samuel Roth | 2016-09-12 | 1 | -2/+2 |
| | | | |||||
| | * | Broken relative links fixed | Samuel Roth | 2016-09-12 | 1 | -6/+6 |
| | | | |||||
| | * | Fixing ForDummies link | Samuel Roth | 2016-09-12 | 1 | -1/+1 |
| | | | |||||
| | * | One works | Samuel Roth | 2016-09-12 | 1 | -1/+1 |
| | | | |||||
| | * | Relative links | Samuel Roth | 2016-09-12 | 1 | -1/+1 |
| | | | |||||
| | * | Fixing relative links | Samuel Roth | 2016-09-12 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #856 from KindDragon/mingw-appveyor | Billy Donahue | 2016-09-07 | 2 | -2/+2 |
|\ \ | | | | | | | Fix Mingw-w64 build | ||||
| * | | Fix build with MinGW-w64refs/pull/856/head | Arkadiy Shapkin | 2016-09-04 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #721 from ilmagico/fix-mingw-threads | Billy Donahue | 2016-08-24 | 4 | -5/+20 |
|\ \ | | | | | | | Fix compilation of googletest with MinGW using Win32 threads | ||||
| * | | Don't use pthread when on MinGW even if availablerefs/pull/721/head | Daniele Tamino | 2016-02-22 | 1 | -1/+3 |
| | | | | | | | | | | | | It's not supported, and native Windows threading is available for MinGW | ||||
| * | | Fix compilation on MinGW with native threads | Daniele Tamino | 2016-02-22 | 3 | -4/+17 |
| |/ | |||||
* | | Merge pull request #821 from mazong1123/masterrelease-1.8.0 | Billy Donahue | 2016-07-14 | 1 | -2/+6 |
|\ \ | | | | | | | Fixed issue #775. Mark the ConvertibleFromAny constructor as explicit, and fix operator overload issue for Unprintable | ||||
| * | | Reformatted the Unprintable operator== code style.refs/pull/821/head | mazong1123 | 2016-07-14 | 1 | -1/+4 |
| | | | |||||
| * | | Fixed issue #775 | mazong1123 | 2016-07-14 | 1 | -2/+3 |
|/ / | |||||
* | | Merge pull request #814 from google/BillyDonahue-patch-2 | Billy Donahue | 2016-06-29 | 1 | -0/+1 |
|\ \ | | | | | | | Add Appveyor badge to Readme.md | ||||
| * | | Add Appveyor badge to Readme.mdrefs/pull/927/headrefs/pull/814/head | Billy Donahue | 2016-06-29 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #723 from KindDragon/master | Billy Donahue | 2016-06-28 | 4 | -5/+88 |
|\ \ | | | | | | | Run MSVC tests on AppVeyor | ||||
| * | | Support running MSVC build on AppVeyourrefs/pull/723/head | Arkadiy Shapkin | 2016-06-27 | 4 | -5/+88 |
|/ / | |||||
* | | Merge pull request #810 from google/rollback_808 | Billy Donahue | 2016-06-26 | 1 | -2/+2 |
|\ \ | | | | | | | Rollback change #808. | ||||
| * | | Rollback change #808.refs/pull/810/head | Billy Donahue | 2016-06-26 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #808 from djmott/master | Billy Donahue | 2016-06-26 | 1 | -2/+2 |
|\ \ | | | | | | | fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions th… | ||||
| * | | Fix to tests that return object which implement operator boolrefs/pull/808/head | David Mott | 2016-06-25 | 1 | -2/+2 |
| | | | |||||
| * | | fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that ↵ | David Mott | 2016-06-25 | 1 | -2/+2 |
|/ / | | | | | | | implement operator bool | ||||
* | | Merge pull request #773 from mazong1123/master | Billy Donahue | 2016-05-15 | 8 | -3/+331 |
|\ \ | | | | | | | Fixed googletest dir issue for building googlemock. | ||||
| * | | Added VS 2015 project support.refs/pull/773/head | mazong1123 | 2016-05-15 | 5 | -0/+328 |
| | | | |||||
| * | | Updated the value of GTEST_DIR to reflect the googletest dir. | mazong1123 | 2016-05-15 | 1 | -1/+1 |
| | | | |||||
| * | | Changed the GTestDir marco value to reflect the new dir of googletest. | mazong1123 | 2016-05-15 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #741 from mbinna/patch-1 | Billy Donahue | 2016-03-16 | 1 | -5/+4 |
|\ \ | | | | | | | Fix whitespace in paragraph | ||||
| * | | Fix whitespace in paragraphrefs/pull/741/head | Manuel Binna | 2016-03-16 | 1 | -5/+4 |
|/ / | |||||
* | | Merge pull request #724 from duggelz/master | Billy Donahue | 2016-03-15 | 3 | -5/+38 |
|\ \ | | | | | | | Read Bazel's $XML_OUTPUT_FILE environment variable |