summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Collapse)AuthorAgeFilesLines
* Minor style fixesrefs/pull/1192/headEduardo Caceres2017-08-104-12/+11
| | | Typos, punctuation & broken links
* Punctuationrefs/pull/1185/headEduardo Cáceres2017-08-091-2/+2
| | | Missing periods
* Merge pull request #675 from theHacker/masterGennadiy Civil2017-08-081-0/+1
|\ | | | | Fix: Markdown in V1_7_Primer.md
| * Fix: Markdown in V1_7_Primer.mdrefs/pull/675/headAlexander Münch2016-01-021-0/+1
| | | | | | table "Basic Assertions" is now rendered correctly as table
* | Merge pull request #909 from AsturaPhoenix/patch-1Gennadiy Civil2017-08-081-1/+1
|\ \ | | | | | | Update Primer.md
| * | Update Primer.mdrefs/pull/909/headRoss Wang2016-10-181-1/+1
| | | | | | | | | Correcting typo: "text fixture" => "test fixture"
* | | Merge pull request #1180 from aconverse/masterGennadiy Civil2017-08-071-1/+2
|\ \ \ | | | | | | | | Use wider types to prevent unsigned overflow diagnostics
| * | | Use wider types to prevent unsigned overflow diagnosticsrefs/pull/1180/headAlex Converse2017-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the (covered) codebase is already integer overflow clean. This is a cherry-pick of an internal change. TESTED=gtest_shuffle_test goes from fail to pass with -fsanitize=integer
* | | | fix small typo in commentrefs/pull/1176/headHerbert Thielen2017-08-051-1/+1
| | | |
* | | | Merge pull request #1030 from vpfautz/masterGennadiy Civil2017-08-0310-11/+11
|\ \ \ \ | |/ / / |/| | | Fixed some typos
| * | | Fixed some typosrefs/pull/1030/headvpfautz2017-02-2610-11/+11
| | | |
* | | | Merge pull request #671 from mehagar/patch-1Gennadiy Civil2017-08-021-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo in AdvancedGuide.md
| * | | | Fix typo in AdvancedGuide.mdrefs/pull/671/headmehagar2015-12-291-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-029-9/+9
|\ \ \ \ | | | | | | | | | | remove duplicated words
| * | | | remove duplicated wordsrefs/pull/764/headLi Peng2016-04-279-9/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
* | | | | Merge pull request #962 from klimkin/klimkin-patch-typoGennadiy Civil2017-08-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix a typo
| * | | | | Fix a typorefs/pull/962/headAlexey Klimkin2016-12-131-1/+1
| | | | | | | | | | | | | | | | | | Help says "FILE_PATH defaults to test_details.xml", but the real path is test_detail.xml.
* | | | | | Merge pull request #968 from nicolacavallini/link_typed_test_docsGennadiy Civil2017-08-021-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | added link to sample 6 in the documentation of typed test
| * | | | | | added link to sample 6 in the documentation of typed testrefs/pull/968/headnicolacavallini2016-12-231-2/+2
| | | | | | |
* | | | | | | fix links to Google C++ Style Guiderefs/pull/1165/headHerbert Thielen2017-07-301-2/+2
| | | | | | |
* | | | | | | Merge pull request #1107 from lipk/patch-1Gennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Minor grammar fix in docs.
| * | | | | | | Remove unnecessary 'the'.refs/pull/1107/headlipk2017-05-301-1/+1
| | | | | | | |
* | | | | | | | Fixes a typo in FAQ.mdrefs/pull/1143/headVincent Palancher2017-07-051-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #1081 from krytarowski/netbsd-1Billy Donahue2017-06-232-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add NetBSD support
| * | | | | | | | Add NetBSD supportrefs/pull/1081/headKamil Rytarowski2017-05-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetBSD is a modern UNIX-like Operating System. Enable GTEST_HAS_PTHREAD and GTEST_HAS_DEATH_TEST on NetBSD.
* | | | | | | | | Colouring in help textrefs/pull/1129/headChris-Sharpe2017-06-211-1/+1
| | | | | | | | |
* | | | | | | | | Create gtest-internal.hBilly Donahue2017-06-111-1/+1
| | | | | | | | |
* | | | | | | | | Fixing float comparison broken linkrefs/pull/1113/headjorgehb2017-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.refs/pull/1091/headNico 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.
* | | | | | | | | Changes add ability to overwrite TempDir(), issue ↵refs/pull/1096/headGennadiy Civil2017-05-182-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/google/googletest/issues/1093
* | | | | | | | | Merge pull request #1089 from nico/stdstringBilly Donahue2017-05-1611-89/+82
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use std::string and ::string explicitly in gtest and gmock code.
| * | | | | | | | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-1511-89/+82
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixing typo in documentation.
| * | | | | | | | | Fixing typo in documentation.refs/pull/1090/headNico Weber2017-05-151-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change.
* | | | | | | | | Gender-neutralize comments in gtest.h.refs/pull/1092/headNico Weber2017-05-151-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This merges a Google-internal change.
* | | | | | | | Merge pull request #725 from donhuff/xcode-headersBilly Donahue2017-05-151-0/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add missing headers to Xcode framework target.
| * | | | | | | | Update C++ language and library settings to match SDK projects.refs/pull/725/headDon Huff2016-03-111-0/+6
| | | | | | | | |
| * | | | | | | | Add missing headers to Xcode framework target.Don Huff2016-02-251-0/+41
| | | | | | | | |
* | | | | | | | | Merge pull request #1078 from pwnall/gtest_api_portBilly Donahue2017-05-112-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.refs/pull/1078/headVictor 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.refs/pull/965/headDavid Benjamin2016-12-222-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 2015refs/pull/1034/headDan Kegel2017-03-023-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.
* | | | | | | | Changes to make TempDir() publicrefs/pull/1077/headGennadiy Civil2017-05-025-22/+29
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #1076.
* | | | | | | fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/refs/pull/996/headsrz_zumix2017-02-021-1/+1
| | | | | | |
* | | | | | | Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_Prefs/pull/982/headMike Bjorge2017-01-101-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 #658 from audiofanatic/ExternalProject_at_configure_timeBilly Donahue2016-12-181-2/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added docs for ExternalProject download during CMake step
| * | | | | | Added CMake configure-time download instructions to docsrefs/pull/658/headCraig Scott2016-12-171-2/+105
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2024-08-30 19:18:24 (GMT)