aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Add gtest-parallel to open-source projects.Peter Boström2017-07-111-0/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1167 from krizalys/fix-typoGennadiy Civil2017-07-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo
| * | | | | | | | | | | | | | Fixed typoChristophe Vidal2017-07-311-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1165 from aninf-wo/hethi/fix-doc-linksGennadiy Civil2017-07-313-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | fix links to Google C++ Style Guide
| * | | | | | | | | | | | | fix links to Google C++ Style GuideHerbert Thielen2017-07-303-4/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1137 from coryan/masterGennadiy Civil2017-07-264-29/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix table formatting.
| * | | | | | | | | | | | | More tables that did not render correctly.Carlos O'Ryan2017-07-014-1/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove silly claim that C++ lacks lambdas.Carlos O'Ryan2017-07-014-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The document itself uses lambdas later, all the scaffolding to work around lack of lambdas should be considered for removal, but that is much larger an effort than I can commit to.
| * | | | | | | | | | | | | Same fixes for "current" version.Carlos O'Ryan2017-07-011-4/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix typos too s/destoyed/destroyed/Carlos O'Ryan2017-07-013-6/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix table formatting.Carlos O'Ryan2017-07-013-6/+9
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The markdown was not working for a small table, fixed.
* | | | | | | | | | | | | Merge pull request #1107 from lipk/patch-1Gennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor grammar fix in docs.
| * | | | | | | | | | | | | Remove unnecessary 'the'.lipk2017-05-301-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1158 from junr03/fix-linkGennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix broken link
| * | | | | | | | | | | | | | docs: fix broken linkJose Nino2017-07-261-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1143 from nyibbang/patch-1Gennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a typo in FAQ.md
| * | | | | | | | | | | | | | Fixes a typo in FAQ.mdVincent Palancher2017-07-051-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1126 from junr03/fix-broken-linkGennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | docs: fix broken link from dummies guide to cook book
| * | | | | | | | | | | | | docs: fix broken link from dummies guide to cook bookJose Nino2017-06-191-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1081 from krytarowski/netbsd-1Billy Donahue2017-06-232-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add NetBSD support
| * | | | | | | | | | | | | Add NetBSD supportKamil Rytarowski2017-05-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetBSD is a modern UNIX-like Operating System. Enable GTEST_HAS_PTHREAD and GTEST_HAS_DEATH_TEST on NetBSD.
* | | | | | | | | | | | | | Merge pull request #1129 from Chris-Sharpe/masterBilly Donahue2017-06-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | Colouring in help text
| * | | | | | | | | | | | | Colouring in help textChris-Sharpe2017-06-211-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Create gtest-internal.hBilly Donahue2017-06-111-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1113 from jorgehb/patch-1Billy Donahue2017-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | Fixing float comparison broken link
| * | | | | | | | | | | | Fixing float comparison broken linkjorgehb2017-06-081-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Updating the link with a valid one. The old one was considered obsolete by the publisher.
* | | | | | | | | | | | Merge pull request #1091 from nico/wmicroBilly Donahue2017-05-231-38/+51
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
| * | | | | | | | | | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.Nico Weber2017-05-151-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change. Original CL description: The C++ standard says that function pointers are not implicitly convertible to object pointers. Visual Studio disregards that and allows implicit conversion between function pointers and object points, and enough code relies on this that clang follows suit in Microsoft-compatibility mode. However, clang emits a -Wmicrosoft-cast warning when such a conversion is done: E:\b\c\b\win_clang\src\sandbox\win\src\sync_dispatcher.cc(42,7): warning: implicit conversion between pointer-to-function and pointer-to-object is a Microsoft extension [-Wmicrosoft-cast] This change fixes this warning in gtest, while hopefully not changing any behavior. The change does two things: 1. It replaces the if in DefaultPrintTo with SFINAE 2. In C++11 mode, it uses enable_if<is_function<>> instead of ImplicitlyConvertible<T*, const void*> to check if the explicit cast is needed. With this change, functions will use the branch with the reintpret_casts with Visual Studio and clang/win, and clang no longer needs to warn that it implicitly converts a function pointer to a void pointer.
* | | | | | | | | | | | | Merge pull request #1096 from gennadiycivil/add-ability-for-custom-temdir-1093Billy Donahue2017-05-182-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes add ability to overwrite TempDir(), issue https://github.com/…
| * | | | | | | | | | | | | Changes add ability to overwrite TempDir(), issue ↵Gennadiy Civil2017-05-182-1/+7
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/google/googletest/issues/1093
* | | | | | | | | | | | | Merge pull request #1089 from nico/stdstringBilly Donahue2017-05-1627-490/+488
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use std::string and ::string explicitly in gtest and gmock code.
| * | | | | | | | | | | | | 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 #1090 from nico/typoBilly Donahue2017-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing typo in documentation.
| * | | | | | | | | | | | | Fixing typo in documentation.Nico Weber2017-05-151-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change.
* | | | | | | | | | | | | Merge pull request #1092 from nico/commentBilly Donahue2017-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Gender-neutralize comments in gtest.h.
| * | | | | | | | | | | | Gender-neutralize comments in gtest.h.Nico Weber2017-05-151-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges a Google-internal change.
* | | | | | | | | | | | 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_/