3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-10 22:40:44 +08:00
Code Issues Projects Releases Wiki Activity
1,051 Commits 7 Branches 27 Tags 39 MiB
Commit Graph

1051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Benjamin
ca6a70c608 Pass MSVC's C4826 warning. 
MSVC has an optional warning which flags when 32-bit pointers get cast
into a 64-bit value. This is a little overaggressive I think, but to
ease compiling in projects with aggressive warnings, fix this by just
casting to const void * directly. Modern GCCs seem to compile it just
fine.
 2017-08-07 14:56:40 -04:00
Gennadiy Civil
eb261b4dce Merge pull request #1176 from aninf-wo/hethi/typo 
fix small typo in comment
 2017-08-07 13:33:08 -04:00
Herbert Thielen
212f4d793e fix small typo in comment 2017-08-05 12:42:00 +02:00
Gennadiy Civil
ca102b1f9d Merge pull request #1030 from vpfautz/master 
Fixed some typos
 2017-08-03 16:49:13 -04:00
Gennadiy Civil
50f3bafb1a Merge pull request #1172 from joelypoley/joelypoley-patch-1 
Fix cmake policy issue
 2017-08-03 00:00:15 -04:00
Joel Laity
568958e940 Fixed cmake policy issue 2017-08-03 15:50:45 +12:00
Gennadiy Civil
28bb854cef Merge pull request #1042 from danilcha/patch-1 
Added description of how to silence clang pedantic warnings in Google Mock includes
 2017-08-02 22:13:30 -04:00
Gennadiy Civil
fa388e9f94 Merge pull request #1170 from Manozco/1169_fix_old_cmake_issue 
Fix policy issue with old cmakes
 2017-08-02 22:08:49 -04:00
Manuel VIVES
b68f1e769c Fix policy issue with old cmakes 
#1169
 2017-08-02 21:03:13 -04:00
Gennadiy Civil
d655d0989d Merge pull request #867 from marzojr/patch-1 
Clarifying documentation language
 2017-08-02 17:09:05 -04:00
Gennadiy Civil
e1f3d8d175 Merge pull request #671 from mehagar/patch-1 
Fix typo in AdvancedGuide.md
 2017-08-02 17:07:27 -04:00
Gennadiy Civil
683fcf5969 Merge pull request #782 from Manozco/709-cmake-policy-project-version 
Issue 709: Fix Cmake policy 0048
 2017-08-02 17:06:45 -04:00
Gennadiy Civil
0cb2eeb5f1 Merge pull request #764 from flyd1005/wip-fix-typo 
remove duplicated words
 2017-08-02 17:04:33 -04:00
Gennadiy Civil
73f321590a Merge pull request #962 from klimkin/klimkin-patch-typo 
Fix a typo
 2017-08-02 16:55:50 -04:00
Gennadiy Civil
032baa0da3 Merge pull request #998 from dawikur/patch-1 
Replace html entities with their equivalents
 2017-08-02 16:47:31 -04:00
Gennadiy Civil
d966d5fbe0 Merge pull request #968 from nicolacavallini/link_typed_test_docs 
added link to sample 6 in the  documentation of typed test
 2017-08-02 16:45:13 -04:00
Gennadiy Civil
e2e37c9432 Merge pull request #1147 from pbos/gtest_parallel_link 
Add gtest-parallel to open-source projects.
 2017-08-01 14:53:18 -04:00
Gennadiy Civil
7755e5d241 Merge pull request #1167 from krizalys/fix-typo 
Fixed typo
 2017-07-31 16:55:33 -04:00
Gennadiy Civil
f08b1c350a Merge pull request #1165 from aninf-wo/hethi/fix-doc-links 
fix links to Google C++ Style Guide
 2017-07-31 13:02:53 -04:00
Christophe Vidal
623616a50a Fixed typo 2017-07-31 22:02:19 +07:00
Herbert Thielen
ec19d455bc fix links to Google C++ Style Guide 2017-07-30 17:05:48 +02:00
Gennadiy Civil
e5b88b227e Merge pull request #1137 from coryan/master 
Fix table formatting.
 2017-07-26 16:52:02 -04:00
Gennadiy Civil
6527ee0624 Merge pull request #1107 from lipk/patch-1 
Minor grammar fix in docs.
 2017-07-26 15:29:54 -04:00
Gennadiy Civil
75bb586b60 Merge pull request #1158 from junr03/fix-link 
docs: fix broken link
 2017-07-26 14:47:56 -04:00
Jose Nino
5c279131db docs: fix broken link 2017-07-26 10:58:05 -07:00
Gennadiy Civil
b9427ca477 Merge pull request #1143 from nyibbang/patch-1 
Fixes a typo in FAQ.md
 2017-07-26 13:36:50 -04:00
Gennadiy Civil
7c3496c4ae Merge pull request #1126 from junr03/fix-broken-link 
docs: fix broken link from dummies guide to cook book
 2017-07-26 13:27:32 -04:00
Peter Boström
1b39c3dcdf Add gtest-parallel to open-source projects. 2017-07-11 13:23:01 -07:00
Vincent Palancher
4568374a6e Fixes a typo in FAQ.md 2017-07-05 14:12:58 +02:00
Carlos O'Ryan
0ffd8629c9 More tables that did not render correctly. 2017-07-01 22:34:51 -04:00
Carlos O'Ryan
2fcbc0c1ab Remove silly claim that C++ lacks lambdas. 
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.
 2017-07-01 15:30:55 -04:00
Carlos O'Ryan
f20797bd8d Same fixes for "current" version. 2017-07-01 15:27:07 -04:00
Carlos O'Ryan
1dde1eed38 Fix typos too s/destoyed/destroyed/ 2017-07-01 15:26:42 -04:00
Carlos O'Ryan
280b22708c Fix table formatting. 
The markdown was not working for a small table, fixed.
 2017-07-01 09:51:45 -04:00
Billy Donahue
4bab34d208 Merge pull request #1081 from krytarowski/netbsd-1 
Add NetBSD support
 2017-06-23 19:35:25 -04:00
Billy Donahue
f050aff0c2 Merge pull request #1129 from Chris-Sharpe/master 
Colouring in help text
 2017-06-23 14:31:40 -04:00
Chris-Sharpe
19cace2873 Colouring in help text 2017-06-21 16:19:25 +01:00
Jose Nino
38ec2a1df6 docs: fix broken link from dummies guide to cook book 2017-06-19 14:27:39 -07:00
Billy Donahue
c2d90bddc6 Create gtest-internal.h 2017-06-11 18:34:04 -04:00
Billy Donahue
a44bbab9bd Merge pull request #1113 from jorgehb/patch-1 
Fixing float comparison broken link
 2017-06-11 18:21:29 -04:00
jorgehb
00ed9b566e Fixing float comparison broken link 
Updating the link with a valid one. The old one was considered obsolete by the publisher.
 2017-06-08 10:01:55 -04:00
lipk
dca9d5fc51 Remove unnecessary 'the'. 2017-05-30 17:29:32 +02:00
Billy Donahue
42bc671f47 Merge pull request #1091 from nico/wmicro 
Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
 2017-05-23 11:10:42 -04:00
Billy Donahue
59c795ce08 Merge pull request #1096 from gennadiycivil/add-ability-for-custom-temdir-1093 
Changes add ability to overwrite TempDir(), issue https://github.com/…
 2017-05-18 16:19:58 -04:00
Gennadiy Civil
76491b74de Changes add ability to overwrite TempDir(), issue https://github.com/google/googletest/issues/1093 2017-05-18 10:19:28 -04:00
Billy Donahue
7cc548dcbf Merge pull request #1089 from nico/stdstring 
Use std::string and ::string explicitly in gtest and gmock code.
 2017-05-16 17:00:03 -04:00
Billy Donahue
078d5d930a Merge pull request #1090 from nico/typo 
Fixing typo in documentation.
 2017-05-15 23:54:23 -04:00
Billy Donahue
2a5d67ccad Merge pull request #1092 from nico/comment 
Gender-neutralize comments in gtest.h.
 2017-05-15 21:26:10 -04:00
Nico Weber
e1466ba4fe Gender-neutralize comments in gtest.h. 
This merges a Google-internal change.
 2017-05-15 18:00:29 -04:00
Nico Weber
09fd5b3ebf Use std::string and ::string explicitly in gtest and gmock code. 
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.
 2017-05-15 17:53:04 -04:00
Nico Weber
b2cbbec04c Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows. 
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.
 2017-05-15 17:21:25 -04:00
Nico Weber
6c0c8a7ea5 Fixing typo in documentation. 
This upstreams a Google-internal change.
 2017-05-15 17:12:19 -04:00
Billy Donahue
294f72bc77 Merge pull request #725 from donhuff/xcode-headers 
Add missing headers to Xcode framework target.
 2017-05-15 11:44:37 -04:00
Billy Donahue
8c7f93feda Merge pull request #1078 from pwnall/gtest_api_port 
Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
 2017-05-10 22:10:01 -04:00
Billy Donahue
887d569eb0 Merge pull request #965 from davidben/format-attr 
Annotate ColoredPrintf with the format attribute and fix bugs.
 2017-05-07 01:07:16 -04:00
Kamil Rytarowski
fac0dfbe73 Add NetBSD support 
NetBSD is a modern UNIX-like Operating System.

Enable GTEST_HAS_PTHREAD and GTEST_HAS_DEATH_TEST on NetBSD.
 2017-05-06 04:18:58 +02:00
Victor Costan
b7cf4414d9 Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h. 
This makes it possible for a port to define the specifier used for
exported symbols without having to change Google Test.
 2017-05-04 10:19:47 -07:00
Billy Donahue
0ad83afdaa Merge pull request #1034 from dankegel/master 
Minimal changes to fix build failures on Microsoft Visual Studio 2015
 2017-05-02 14:53:21 -04:00
Billy Donahue
69c6db249a Merge pull request #1077 from gennadiycivil/make-temp-dir-public-issue-1076 
Changes to make TempDir() public
 2017-05-02 14:52:05 -04:00
Gennadiy Civil
611e8a99de Changes to make TempDir() public 
Fixes #1076.
 2017-05-02 14:16:11 -04:00
danilcha
5ff680577d Again rewrote everything 2017-03-12 18:11:22 +01:00
danilcha
81bc87652d Added explicit gtest library dependency 2017-03-12 17:47:14 +01:00
danilcha
b6c4d434db Update README.md 2017-03-11 01:06:58 +01:00
danilcha
b2521c890a Update README.md 2017-03-11 01:02:21 +01:00
Dan Kegel
518e0519ca Minimal changes to fix build failures on Microsoft Visual Studio 2015 
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.
 2017-03-01 18:40:48 -08:00
vpfautz
a2451c7403 Fixed some typos 2017-02-26 19:15:33 +01:00
Billy Donahue
aa148eb2b7 Merge pull request #1029 from google/BillyDonahue-patch-3 
Remove /tree/ from Readme.md links.
 2017-02-25 20:47:57 -05:00
Billy Donahue
ba638689e4 Remove /tree/ from Readme.md links. 
Issue #1028
 2017-02-25 20:46:21 -05:00
Billy Donahue
51143d5b62 Merge pull request #996 from srz-zumix/fix-error 
fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/
 2017-02-17 10:50:24 -05:00
Dawid Kurek
51d92b2ccb Replace html entities with their equivalents 2017-02-06 13:31:11 +01:00
srz_zumix
9655b9f53d fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/ 2017-02-03 08:05:22 +09:00
Billy Donahue
d62d6c6556 Merge pull request #982 from mbjorge/unused-variable-fix 
Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_P
 2017-01-31 17:09:47 -05:00
Billy Donahue
9ae086a9eb Merge pull request #874 from sejr/master 
Fixing broken relative links in Google Mock documentation
 2017-01-23 16:13:43 -05:00
Sam Roth
3134af23d7 Merge pull request #1 from google/master 
Syncing my branch
 2017-01-23 13:49:32 -05:00
Mike Bjorge
06a81e9357 Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_P 
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.
 2017-01-09 16:02:55 -08:00
nicolacavallini
2eaab21554 added link to sample 6 in the documentation of typed test 2016-12-23 11:45:08 +01:00
David Benjamin
53c478d639 Annotate ColoredPrintf with the format attribute and fix bugs. 
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".
 2016-12-21 20:57:21 -05:00
Billy Donahue
5e7fd50e17 Merge pull request #658 from audiofanatic/ExternalProject_at_configure_time 
Added docs for ExternalProject download during CMake step
 2016-12-18 11:59:12 -05:00
Craig Scott
c0059a79f8 2.6.4 is the minimum CMake version, so enforce it (#656) 2016-12-17 19:15:04 -05:00
Craig Scott
cb502b7ad1 Added CMake configure-time download instructions to docs 
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.
 2016-12-18 09:01:27 +11:00
Alexey Klimkin
3ec005239f Fix a typo 
Help says "FILE_PATH defaults to test_details.xml", but the real path is test_detail.xml.
 2016-12-12 16:38:14 -08:00
Billy Donahue
a2b8a8e076 Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONE 
Fix detection of GTEST_HAS_CLONE for Android.
 2016-11-03 16:36:28 -04:00
Billy Donahue
3447fc31b4 Merge pull request #728 from DanAlbert/tuple-stlport 
Fix a test to compile when tuple isn't available.
 2016-11-02 13:54:19 -04:00
Dan Albert
4eafafbde5 Fix detection of GTEST_HAS_CLONE for Android. 
This was not in Gingerbread for anything but ARM (even though the
libs were hacked to lie about it being available in gingerbread).
 2016-11-01 06:37:49 -07:00
Billy Donahue
ecd530865c Merge pull request #876 from marco-m/patch-1 
mock cookbook: fix broken relative link
 2016-09-21 16:22:52 -04:00
Marco Molteni
8ce0b5907c Cookbok: fix broken relative link 2016-09-13 20:53:41 +02:00
Samuel Roth
32b4a9b390 Fixed broken links 2016-09-12 12:34:50 -04:00
Samuel Roth
0e0ff5c341 blob vs tree 2016-09-12 12:33:44 -04:00
Samuel Roth
960a511f45 Fixing relative links 2016-09-12 12:31:50 -04:00
Samuel Roth
995db996de Fixing KnownIssues and FrequentlyAskedQuestions links 2016-09-12 12:27:36 -04:00
Samuel Roth
f5c0130e88 Broken relative links fixed 2016-09-12 12:24:08 -04:00
Samuel Roth
9cb03aa702 Fixing ForDummies link 2016-09-12 12:19:26 -04:00
Samuel Roth
51b290d41e One works 2016-09-12 12:15:49 -04:00
Samuel Roth
16d6af7d41 Relative links 2016-09-12 12:14:53 -04:00
Samuel Roth
10ff7f9468 Fixing relative links 2016-09-12 12:14:00 -04:00
Billy Donahue
48ee8e98ab Merge pull request #856 from KindDragon/mingw-appveyor 
Fix Mingw-w64 build
 2016-09-07 14:48:12 -04:00
Arkadiy Shapkin
d8fe70f477 Fix build with MinGW-w64 2016-09-05 00:57:49 +03:00
Marzo Sette Torres Junior
f700442db3 Clarifying language 
The old language might mislead someone into thinking that the access level on the base class itself was changed.
 2016-09-02 14:39:48 -03:00
Billy Donahue
ed9d1e1ff9 Merge pull request #721 from ilmagico/fix-mingw-threads 
Fix compilation of googletest with MinGW using Win32 threads
 2016-08-24 08:15:38 -04:00
Billy Donahue
ec44c6c167 Merge pull request #821 from mazong1123/master 
Fixed issue #775. Mark the ConvertibleFromAny constructor as explicit, and fix operator overload issue for Unprintable
release-1.8.0 		2016-07-14 13:15:38 -04:00