aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-1527-490/+488
| | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.
* Merge pull request #725 from donhuff/xcode-headersBilly Donahue2017-05-152-0/+48
|\ | | | | Add missing headers to Xcode framework target.
| * Update C++ language and library settings to match SDK projects.Don Huff2016-03-112-0/+7
| |
| * Add missing headers to Xcode framework target.Don Huff2016-02-251-0/+41
| |
* | Merge pull request #1078 from pwnall/gtest_api_portBilly Donahue2017-05-102-1/+11
|\ \ | | | | | | Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
| * | Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.Victor Costan2017-05-042-1/+11
| | | | | | | | | | | | | | | This makes it possible for a port to define the specifier used for exported symbols without having to change Google Test.
* | | Merge pull request #965 from davidben/format-attrBilly Donahue2017-05-072-3/+21
|\ \ \ | |/ / |/| | Annotate ColoredPrintf with the format attribute and fix bugs.
| * | Annotate ColoredPrintf with the format attribute and fix bugs.David Benjamin2016-12-212-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | googletest doesn't currently build with clang's very aggressive -Wformat-nonliteral warning. It requires that all non-literal format strings come from the argument of a function annotated with a compatible format attribute. Fixing that reports that ColoredPrintf's callers weren't passing the normal -Wformat warning. Some messages were passed directly into the format string rather than via "%s".
* | | Merge pull request #1034 from dankegel/masterBilly Donahue2017-05-023-2/+4
|\ \ \ | | | | | | | | Minimal changes to fix build failures on Microsoft Visual Studio 2015
| * | | Minimal changes to fix build failures on Microsoft Visual Studio 2015Dan Kegel2017-03-013-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the following errors: hash_map(17): error C2338: <hash_map> is deprecated and will be REMOVED. Please use <unordered_map>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj] hash_set(17): error C2338: <hash_set> is deprecated and will be REMOVED. Please use <unordered_set>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj] googletest\test\gtest_catch_exceptions_test_.cc(152): error C2220: warning treated as error - no 'object' file generated googletest\test\gtest_catch_exceptions_test_.cc(152): warning C4297: 'CxxExceptionInDestructorTest::~CxxExceptionInDestructorTest': function assumed not to throw an exception but does googletest\test\gtest_catch_exceptions_test_.cc(152): note: destructor or deallocator has a (possibly implicit) non-throwing exception specification There were already some checks for _MSC_VER in the code, so this commit continues in that vein.
* | | | Merge pull request #1077 from gennadiycivil/make-temp-dir-public-issue-1076Billy Donahue2017-05-025-22/+29
|\ \ \ \ | |/ / / |/| | | Changes to make TempDir() public
| * | | Changes to make TempDir() publicGennadiy Civil2017-05-025-22/+29
|/ / / | | | | | | | | | Fixes #1076.
* | | Merge pull request #1029 from google/BillyDonahue-patch-3Billy Donahue2017-02-251-4/+4
|\ \ \ | | | | | | | | Remove /tree/ from Readme.md links.
| * | | Remove /tree/ from Readme.md links.Billy Donahue2017-02-251-4/+4
|/ / / | | | | | | Issue #1028
* | | Merge pull request #996 from srz-zumix/fix-errorBilly Donahue2017-02-171-1/+1
|\ \ \ | | | | | | | | fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/
| * | | fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/srz_zumix2017-02-031-1/+1
|/ / /
* | | Merge pull request #982 from mbjorge/unused-variable-fixBilly Donahue2017-01-311-3/+4
|\ \ \ | | | | | | | | Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_P
| * | | Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_PMike Bjorge2017-01-091-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/masterBilly Donahue2017-01-231-6/+6
|\ \ \ | |/ / |/| | Fixing broken relative links in Google Mock documentation
| * | Merge pull request #1 from google/masterSam Roth2017-01-238-8/+127
| |\ \ | |/ / |/| | Syncing my branch
* | | Merge pull request #658 from audiofanatic/ExternalProject_at_configure_timeBilly Donahue2016-12-182-2/+115
|\ \ \ | | | | | | | | Added docs for ExternalProject download during CMake step
| * | | Added CMake configure-time download instructions to docsCraig Scott2016-12-182-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 Scott2016-12-173-3/+3
|/ / /
* | | Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONEBilly Donahue2016-11-031-2/+6
|\ \ \ | | | | | | | | Fix detection of GTEST_HAS_CLONE for Android.
| * | | Fix detection of GTEST_HAS_CLONE for Android.Dan Albert2016-11-011-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-stlportBilly Donahue2016-11-021-0/+2
|\ \ \ | | | | | | | | Fix a test to compile when tuple isn't available.
| * | | Fix a test to compile when tuple isn't available.Dan Albert2016-03-021-0/+2
| |/ /
* | | Merge pull request #876 from marco-m/patch-1Billy Donahue2016-09-211-1/+1
|\ \ \ | | | | | | | | mock cookbook: fix broken relative link
| * | | 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
| |/ |/|
* | Merge pull request #856 from KindDragon/mingw-appveyorBilly Donahue2016-09-072-2/+2
|\ \ | | | | | | Fix Mingw-w64 build
| * | Fix build with MinGW-w64Arkadiy Shapkin2016-09-052-2/+2
|/ /
* | Merge pull request #721 from ilmagico/fix-mingw-threadsBilly Donahue2016-08-244-5/+20
|\ \ | | | | | | Fix compilation of googletest with MinGW using Win32 threads
| * | Don't use pthread when on MinGW even if availableDaniele Tamino2016-02-221-1/+3
| | | | | | | | | | | | It's not supported, and native Windows threading is available for MinGW
| * | Fix compilation on MinGW with native threadsDaniele Tamino2016-02-223-4/+17
| |/
* | Merge pull request #821 from mazong1123/masterBilly Donahue2016-07-141-2/+6
|\ \ | | | | | | Fixed issue #775. Mark the ConvertibleFromAny constructor as explicit, and fix operator overload issue for Unprintable
| * | Reformatted the Unprintable operator== code style.mazong11232016-07-141-1/+4
| | |
| * | Fixed issue #775mazong11232016-07-141-2/+3
|/ /
* | Merge pull request #814 from google/BillyDonahue-patch-2Billy Donahue2016-06-281-0/+1
|\ \ | | | | | | Add Appveyor badge to Readme.md
| * | Add Appveyor badge to Readme.mdBilly Donahue2016-06-281-0/+1
|/ /
* | Merge pull request #723 from KindDragon/masterBilly Donahue2016-06-284-5/+88
|\ \ | | | | | | Run MSVC tests on AppVeyor
| * | Support running MSVC build on AppVeyourArkadiy Shapkin2016-06-274-5/+88
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 13:15:53 +0000