Commit Graph

1239 Commits

Author SHA1 Message Date
Billy Donahue
f050aff0c2 Merge pull request #1129 from Chris-Sharpe/master
Colouring in help text
2017-06-23 14:31:40 -04:00
Zulkarnine Mahmud
271fb8ff5e Fix a problem when bg_color == fg_color
Invert the intensity bit if the background_color == foreground_color
2017-06-22 11:06:17 +09:00
Chris-Sharpe
19cace2873 Colouring in help text 2017-06-21 16:19:25 +01:00
Zulkarnine Mahmud
365df11427 Add background_mask instead of using magic number 2017-06-21 09:17:51 +09:00
Zulkarnine Mahmud
649aa29552 Fix background color in ColoredPrintf
Re-use existing background color for Widows' console window.
This fixes a problem where the background color for ColoredPrintf would be BLACK even if the user's console is using a different BG color.
2017-06-20 15:40:53 +09:00
Jose Nino
38ec2a1df6 docs: fix broken link from dummies guide to cook book 2017-06-19 14:27:39 -07:00
Hector Dearman
41ad243d93 Fix typo in gmock-actions.h
This upstreams a Google-internal change (141765019).
2017-06-19 18:43:55 +01:00
Hector Dearman
24054ff073 Fixed misspelling in assertion message.
This upstreams a Google-internal change (146491438).
2017-06-19 18:27:33 +01: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
Claus Stovgaard
a6418a4dd1 Merge remote-tracking branch 'github_google/master' into master-github_frosteyes 2017-04-05 10:18:07 +02: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
Olivier Clavel
b74070cfd9 googlemock version must be changed as well
keep googletest and googlemock versions in sync
2017-02-13 22:15:22 +01:00
Olivier Clavel
fa892afcb9 Wrong version reported (1.7.0 should be 1.8.0)
`gtest-config --version` reports wrong version.

Made against master branch but please note that this affects tag release-1.8.0 and the distribution tarballs.
2017-02-13 14:59:00 +01: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