Gennadiy Civil
f5871009e6
yet more
2018-04-09 16:04:48 -04:00
Gennadiy Civil
05b5a53898
formatting
2018-04-09 15:50:19 -04:00
Gennadiy Civil
2de24fbf7a
tuning
2018-04-09 15:39:12 -04:00
Gennadiy Civil
055f32199a
tuning
2018-04-09 15:38:38 -04:00
Gennadiy Civil
44da2b9ac5
cont
2018-04-09 15:23:00 -04:00
Gennadiy Civil
e93a0ece26
msvc
2018-04-09 13:51:01 -04:00
Gennadiy Civil
c4684b49cf
more msvc
2018-04-09 12:03:40 -04:00
Gennadiy Civil
431bfdcaf4
msvc 14
2018-04-09 11:48:02 -04:00
Gennadiy Civil
8bc7c631e8
testing msvc again
2018-04-09 11:35:01 -04:00
Gennadiy Civil
c4e3d77ddc
More msvc 14
2018-04-09 11:22:11 -04:00
Gennadiy Civil
6525044ce2
And also silence for MSVS14
2018-04-09 10:51:15 -04:00
Gennadiy Civil
35a709a701
preproc syntax ( I can never remember it)
2018-04-09 10:25:59 -04:00
Gennadiy Civil
61e8a0b10b
syntax
2018-04-09 10:08:12 -04:00
Gennadiy Civil
03be5df17c
cont.
2018-04-09 09:59:09 -04:00
Gennadiy Civil
e0b3c269c2
continued
2018-04-09 09:51:02 -04:00
Gennadiy Civil
d0de1180e4
Merge branch 'master' of github.com:google/googletest
2018-04-09 09:29:37 -04:00
Victor Costan
51f8ad47df
Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.
...
Commit fe402c2779
2018-04-06 17:21:05 -07:00
Gennadiy Civil
dbd206e3d9
more mcvs fixing
2018-04-06 16:55:46 -04:00
Gennadiy Civil
701e1e5dc1
linkage, fixing MSVC
2018-04-06 16:43:35 -04:00
Gennadiy Civil
2d4d4ef739
fixing MSVC
2018-04-06 16:31:11 -04:00
Henry Schreiner
4b6a7a49ab
Merge branch 'master' into cleanup-cmake
2018-04-06 21:52:42 +02:00
Gennadiy Civil
5fe8de5ded
more warnings
2018-04-06 11:40:04 -04:00
Gennadiy Civil
c75b76e20a
warnings
2018-04-06 11:00:13 -04:00
Gennadiy Civil
04e31881fc
cont - 2
2018-04-06 10:52:49 -04:00
Gennadiy Civil
32ac949254
cont
2018-04-06 10:43:11 -04:00
Gennadiy Civil
1831ac9361
more warnings
2018-04-06 10:35:09 -04:00
Gennadiy Civil
eb3e4aac2e
deal with MSVC warn, cont 1
2018-04-06 10:24:49 -04:00
Gennadiy Civil
50c0bcd7e3
Cont. deal with MCVS warnings
2018-04-06 10:15:00 -04:00
Gennadiy Civil
b5c87fbcb6
Deal with MCVS warnings
2018-04-06 10:01:40 -04:00
Gennadiy Civil
88fc7d7552
merging gmock-actions 2
2018-04-06 09:50:01 -04:00
Gennadiy Civil
fe402c2779
Merging gMock, 2
2018-04-05 16:09:17 -04:00
Gennadiy Civil
7e5f90d378
formatting
2018-04-05 14:41:16 -04:00
Gennadiy Civil
928636135b
And more MCVS warnings
2018-04-05 14:24:12 -04:00
Gennadiy Civil
e0f4cf0561
fixing MCVS warn
2018-04-05 14:00:14 -04:00
Gennadiy Civil
7045138a0d
Have to wait for this one
2018-04-05 11:59:59 -04:00
Gennadiy Civil
66eaf9f0eb
Have to wait for this one
2018-04-05 11:55:25 -04:00
Gennadiy Civil
af93d59eb7
Merging matchers test
2018-04-05 11:35:20 -04:00
Gennadiy Civil
0cd6a4f5f5
Merging matchers test
2018-04-05 11:34:19 -04:00
Henry Fredrick Schreiner
b22e8dec40
Clean up cache non-advanced variable for subproject
2018-04-05 13:40:26 +02:00
Gennadiy Civil
d81b6a0c4c
bad cut/paste
2018-04-04 15:46:04 -04:00
Gennadiy Civil
a608d4a362
More on MSVC warning C4503, decorated name length exceeded
2018-04-04 15:44:27 -04:00
Gennadiy Civil
6f4e93943a
More on MSVC warning C4503, decorated name length exceeded
2018-04-04 15:29:05 -04:00
Gennadiy Civil
5b3d27729b
Address MSVC warning C4503, decorated name length exceeded, name was truncated
2018-04-04 15:07:52 -04:00
Gennadiy Civil
aa14cc4285
Fixing build break on MSVC
2018-04-04 14:48:06 -04:00
Gennadiy Civil
e55089ec11
merging gmock matchers 1
2018-04-04 14:05:00 -04:00
Gennadiy Civil
6aae206bc2
merging gmock-matchers.h 3
2018-03-26 10:36:26 -04:00
Gennadiy Civil
23187058e7
merging gmock-matchers.h 2
2018-03-26 10:16:59 -04:00
Gennadiy Civil
8ea10d3878
Upstreaming FloatingEq2Matcher,
2018-03-26 09:28:16 -04:00
Gennadiy Civil
b907c26740
Merging gmock-matchers.h -2
2018-03-23 11:42:41 -04:00
Gennadiy Civil
466a49ae30
gmock-matchers merging -2
2018-03-23 11:23:54 -04:00
Gennadiy Civil
b7c568326c
merging, gmock -1
2018-03-22 15:35:37 -04:00
Gennadiy Civil
af463c43ac
More merges, removing old dead code
2018-03-13 11:13:37 -04:00
Gennadiy Civil
dbf63e38a4
merges-2
2018-03-05 13:28:13 -05:00
Gennadiy Civil
a518bd5cf2
Merge branch 'master' of https://github.com/google/googletest
2018-03-05 12:26:24 -05:00
Gennadiy Civil
0d5e01ad7b
Merges-1
2018-03-05 12:26:15 -05:00
Gennadiy Civil
f8fbe1c821
Merge branch 'master' into unsigned-wchar
2018-03-01 11:18:17 -05:00
Xiaoyi Zhang
e1622337ae
Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher
2018-02-27 16:06:07 -05:00
Xiaoyi Zhang
576d689c19
Merge branch 'master' into variant_matcher
2018-02-27 16:03:36 -05:00
Xiaoyi Zhang
2eb31c185c
Add documentation for VariantWith.
2018-02-27 16:00:42 -05:00
Gennadiy Civil
2bd1750ba7
gmock merging -2
2018-02-27 13:51:09 -05:00
Xiaoyi Zhang
190e2cdd0b
Add matcher for std::variant.
2018-02-27 11:36:21 -05:00
Scott Graham
567b40eeb1
Try to handle unsigned wchar_t (arm) a bit better
2018-02-23 12:28:09 -08:00
Gennadiy Civil
225e6741ac
moving JoinAsTuple to internal
2018-02-12 16:42:12 -05:00
Gennadiy Civil
22a115055a
Merge pull request #1446 from tholsapp/master
...
Fixed typos
2018-02-09 11:34:26 -05:00
Gennadiy Civil
ec7faa943d
merges
2018-02-09 10:41:09 -05:00
Troy Holsapple
c8510504dd
Fixed typos
2018-02-07 22:06:00 -08:00
Gennadiy Civil
6c0c389601
Adding tests to googlemock bazel
2018-01-26 16:30:57 -05:00
Gennadiy Civil
fbb48a7708
Code merges
2018-01-26 11:57:58 -05:00
Gennadiy Civil
0e6da4cead
Merge branch 'master' into fix-core-dump-shared
2018-01-09 00:22:32 -05:00
Loo Rong Jie
cbd15d417e
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
...
and x64_windows_msvc
2018-01-09 08:29:44 +08:00
Gennadiy Civil
6b4967a23a
Merge branch 'master' into missing-declarations
2018-01-04 22:01:38 -05:00
Gennadiy Civil
4216f869f7
Merge branch 'master' into master
2018-01-04 10:13:00 -05:00
Gennadiy Civil
1c09831acc
upstreaming cl 124976692
2018-01-03 16:57:05 -05:00
David Benjamin
b3d9be5c1d
Pass the -Wmissing-declarations warning.
...
This makes it easier to use GTest in projects that build with the
-Wmissing-declarations warning. This fixes the warning in headers and
source files, though not GTest's own tests as it is rather noisy there.
2018-01-03 14:50:22 -05:00
Gennadiy Civil
e76c3f837c
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-22 14:47:25 -05:00
bryanzim
8cbda54f48
Merge branch 'master' into master
2017-12-15 16:52:50 -05:00
Gennadiy Civil
f6c44fe318
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-15 15:49:46 -05:00
Josh Bodily
3e2cb75446
Merge branch 'master' into josh/fix_scoped_class2
2017-12-12 10:36:37 -07:00
Carlos O'Ryan
f34cbefe50
Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license
2017-12-11 19:34:19 -05:00
Carlos O'Ryan
23a014ab57
Refactor docs about contributions to CONTRIBUTING.md.
...
Per the review comments.
2017-12-11 19:33:27 -05:00
Bryan Zimmerman
74a5306313
remove extra line
2017-12-11 12:21:35 -05:00
Bryan Zimmerman
3ea06317cd
remove implicit casts
2017-12-11 12:19:56 -05:00
bryanzim
f98c20baa8
Merge branch 'master' into master
2017-12-11 09:37:55 -05:00
Gennadiy Civil
10ef1d9a1e
Merge branch 'master' into use-system-includes
2017-12-08 15:11:13 -05:00
bryanzim
d6a4478caf
Merge branch 'master' into master
2017-12-08 13:11:34 -05:00
Carlos O'Ryan
cf3adad594
Add licenses() directive for googlemock/tests.
...
Without the directive embedding googletest into third_party breaks
any //... target.
2017-12-08 12:08:25 -05:00
Gennadiy Civil
a30e15b144
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-08 11:56:41 -05:00
bryanzim
4aae1600d0
Merge branch 'master' into master
2017-12-08 11:31:31 -05:00
Gennadiy Civil
cdedd189b2
Merge branch 'master' into fix-core-dump-shared
2017-12-08 11:12:19 -05:00
Wojciech Mamrak
3464f76e89
Improved description of VS std::tuple support
2017-12-07 18:18:17 +01:00
Carlos O'Ryan
aea8580ecf
Run autoconf from top-level directory.
...
This is part (hopefully all) of the fixes for #776 . The top-level
configure.ac configures googletest first and then googlemock.
With this changes it is possible to embed googletest into another
project that uses autoconf. For an example (though it is WIP), see
the commits (and soon PR) referenced from google/protobuf#236 .
2017-12-03 14:07:35 -05:00
Romain Geissler
0663ce9024
Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both.
2017-12-02 22:47:20 +01:00
Sam Lunt
f46bd00e36
make includes system
2017-11-27 17:31:07 -06:00
Bryan Zimmerman
1ae4096b9c
fix for VS2017 deprecation of ::tr1::tuple
...
change static_cast to ImplicitCast_ for consitency
fixes for building with path names containing spaces
2017-10-27 14:01:16 -04:00
Romain Geissler
20e2de7d8b
Remove gcc 6 misleading indentations.
2017-10-25 17:53:01 +02:00
Arkady Shapkin
840c711e7b
Fix gmock tests when std::unary_function unavailable
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
2641b021fc
Fix tests with VS2015 and VS2017
2017-10-25 16:04:01 +03:00
Dariusz Ostolski
ecb1c3ddb6
#1282 : Doc typo fix
2017-10-14 18:33:19 +02:00
Jonathan Wakely
b70cf1a663
Use gender-neutral pronouns in comments and docs
2017-09-27 13:31:13 +01:00
Alex Yursha
4f68ab5b84
Fix ellipsis position in examples
2017-09-08 17:20:59 -07:00
Gennadiy Civil
857ddeadeb
Merge pull request #975 from LebedevRI/respect-option
...
CMake: use threads if allowed and found, not just if found.
2017-09-05 13:07:37 -04:00
Gennadiy Civil
7c6353d29a
Merge pull request #900 from Gallaecio/patch-1
...
Fix WhenSorted() documentation example
2017-09-01 15:20:54 -04:00
Roman Lebedev
1a62d1b088
CMake: use threads if allowed and found, not just if found.
...
If the user's cmakelists.txt first look for threads using
find_package(Threads), then set(gtest_disable_pthreads ON),
and then include googletest. GoogleTest will not look for
threads. But since they have already been found before in
user's cmakelists, it will use them regardless.
This helped me fix build issue in darktable-org/rawspeed
on windows/MSYS2, even though there are threads, and they
are usable, googletest build was failing with issues
about AutoHandle. I was first looking for threads, and only
then including googletest, so no matter the value of
gtest_disable_pthreads, it failed.
The other obvious solution is for user to first include
googletest, and only then look for threads by himself.
2017-09-01 21:02:59 +03:00
Gennadiy Civil
e4f6c0b358
Merge pull request #1011 from zeitounator/wrong-version-reported
...
Wrong version reported (1.7.0 should be 1.8.0)
2017-09-01 13:38:26 -04:00
Herbert Thielen
e033d8c73d
change links from former code.google.com to current github repository
2017-08-31 18:12:17 +02:00
Herbert Thielen
bb8399e1ba
use plural verb as mentioned in issue #1105
2017-08-29 21:20:46 +02:00
Herbert Thielen
29c07aa9db
remove Yob's comma mentioned in issue #1105
2017-08-29 21:19:45 +02:00
Alyssa Wilk
fa5d3b3845
Applying lint checks from upstream google3
2017-08-28 16:13:41 -04:00
Alyssa Wilk
c00373320d
Merge branch 'refs/heads/master' into flag-default
2017-08-28 16:10:12 -04:00
Arkady Shapkin
cb8ebf5c9a
Support x64 configuration for old VS2015 projects
2017-08-25 01:58:00 +03:00
Gennadiy Civil
f4abce4609
Merge branch 'master' into vs-projects-fix
2017-08-22 22:38:22 -04:00
Arkady Shapkin
88269cd365
Support x64 configuration for old VS2010 projects
...
VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
2017-08-23 01:45:44 +03:00
Roman Perepelitsa
966b549c88
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Gennadiy Civil
96f7ba83cb
Merge branch 'master' into wrong-version-reported
2017-08-21 13:11:58 -04:00
Maurice Gilden
1ee8079651
Remove unused variable
2017-08-21 10:10:14 +02:00
Gennadiy Civil
3cf65b5d86
Added "explicit" as per compiler suggestion
2017-08-20 15:20:13 -04:00
Gennadiy Civil
026735daf3
Proposing these changes, please review
...
Slightly better names and cleaner tests.
Please review
2017-08-20 15:15:31 -04:00
Maurice Gilden
b0ed43e724
Change tabs to spaces in test case
2017-08-18 15:27:02 +02:00
Maurice Gilden
36777251c0
Switch return type to class without default constructor
2017-08-18 12:28:50 +02:00
Maurice Gilden
cc99900036
Fix test if exceptions are not supported
2017-08-18 11:46:15 +02:00
Maurice Gilden
95f18d9938
adds test for NiceMock with unknown return value
2017-08-18 11:21:28 +02:00
Josh Bodily
960de71512
Merge branch 'master' into josh/fix_scoped_class2
2017-08-16 10:56:43 -06:00
Alyssa Wilk
a2803bc37d
Handling invalid flag values
2017-08-16 12:43:26 -04:00
Maurice Gilden
5b4166f05f
Add function name to exception if there's no default action
2017-08-16 17:53:16 +02:00
David Seifert
8604c4adac
Add support for pkgconfig
2017-08-14 13:45:56 +02:00
Gennadiy Civil
e533ff4bd3
Merge pull request #926 from bartshappee/patch-1
...
Fix small typo in Cookbook: SeArrayArgument
2017-08-11 10:33:36 -04:00
Gennadiy Civil
e3bd4cbeae
Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
...
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
4283f264d6
Merge pull request #957 from sglass68/sim
...
Fix a few documentation nits in the mock dummies guide
2017-08-10 21:25:06 -04:00
Gennadiy Civil
c822c85659
Merge pull request #1164 from aninf-wo/hethi/remove-old-docs
...
remove documentation of former versions - it's available in the commit history
2017-08-10 21:19:03 -04:00
Gennadiy Civil
cfab28d594
Merge pull request #1192 from eduherminio/master
...
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
e578186528
Merge pull request #1191 from gennadiycivil/master
...
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
Herbert Thielen
dc7214f222
say "former version" instead of "released version"
2017-08-10 20:21:46 +02:00
Josh Bodily
713b077870
Fix scoped enum not working in gmock-gen.py
2017-08-10 10:58:57 -06:00
Eduardo Caceres
854b28f199
Minor style fixes
...
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
cb5b05436d
Added Copyright
2017-08-10 12:03:27 -04:00
misterg
b98e30b427
Initial Revision, review 164634031
2017-08-10 11:54:46 -04:00
Alyssa Wilk
6e1970e237
Adding a flag option to change the default mock type
2017-08-10 09:41:09 -04:00
Matthew Woehlke
0e8e0e07d6
Fix library install destinations
...
Modify library install destinations to install .dll's to the correct
location (`bin`, not `lib`), and to install other artifacts to the
correct platform-dependent location by using GNUInstallDirs. This is
required for some distributions (e.g. Fedora) and will fix an issue that
otherwise requires those distributions to patch the upstream sources.
Also, add options to suppress installation, which may be useful for
projects that embed Google Test.
Since Google Test is trying to support archaic versions of CMake, a
brain-dead fallback (which requires that the user set either LIB_SUFFIX
or CMAKE_INSTALL_LIBDIR themselves) is included for versions that
predate GNUInstallDirs.
Fixes #1161 .
Co-Authored-By: d3x0r <d3x0r@users.noreply.github.com>
2017-08-09 15:29:36 -04:00
misterg
66a036959f
WIP
2017-08-09 14:37:58 -04:00
misterg
5a5e3c17bb
Added googlemock tests
2017-08-09 12:18:12 -04:00
misterg
4f5c01b4c9
Added googlemock tests
2017-08-09 12:15:00 -04:00
Herbert Thielen
e022dcded8
Merge branch 'master' into hethi/remove-old-docs
2017-08-09 11:03:27 +02:00
Gennadiy Civil
461713fec4
Merge pull request #1123 from chromy/upstream-141765019
...
Fix typo in gmock-actions.h
2017-08-08 16:17:52 -04:00
Gennadiy Civil
aadf53d2a2
Merge pull request #1122 from chromy/upstream-146491438
...
Fixed misspelling in assertion message.
2017-08-08 16:15:57 -04:00
Shlomi Fish
aac403334d
Correct some typos in a comment
2017-08-04 10:39:35 +03: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
d655d0989d
Merge pull request #867 from marzojr/patch-1
...
Clarifying documentation language
2017-08-02 17:09:05 -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
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
7755e5d241
Merge pull request #1167 from krizalys/fix-typo
...
Fixed typo
2017-07-31 16:55:33 -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
Herbert Thielen
6b89677481
remove doc of former versions
...
The documentation of former versions is available in the history (e.g.
by checking out the appropriate git tags), so there is no need to keep
them in parallel to the current documentation.
2017-07-30 16:34:25 +02:00
Herbert Thielen
58b42274c0
remove obsolete reference to SVN trunk and fix link to pump manual
2017-07-30 16:33:08 +02:00
Gennadiy Civil
e5b88b227e
Merge pull request #1137 from coryan/master
...
Fix table formatting.
2017-07-26 16:52:02 -04:00
Jose Nino
5c279131db
docs: fix broken link
2017-07-26 10:58:05 -07: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
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
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
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
Billy Donahue
ba638689e4
Remove /tree/ from Readme.md links.
...
Issue #1028
2017-02-25 20:46:21 -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
Dawid Kurek
51d92b2ccb
Replace html entities with their equivalents
2017-02-06 13:31:11 +01:00
Sam Roth
3134af23d7
Merge pull request #1 from google/master
...
Syncing my branch
2017-01-23 13:49:32 -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
Simon Glass
0fdf78b966
Fix a few documentation nits in the mock dummies guide
...
Add a hyphen to 'ad hoc' and change 'distance' to plural.
2016-12-08 10:57:46 -05:00
bartshappee
bef93f32c1
Fix small typo SeArrayArgument
...
SeArrayArgument => SetArrayArgument
2016-11-07 13:33:22 -05:00
Gallaecio
194e3c8102
Fix WhenSorted() documentation example
2016-10-08 22:17:31 +02: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
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
mazong1123
dc2dbf1fbf
Reformatted the Unprintable operator== code style.
2016-07-14 16:49:42 +08:00
mazong1123
531bf5c410
Fixed issue #775
2016-07-14 14:09:05 +08:00
mazong1123
5bae126d66
Added VS 2015 project support.
2016-05-15 21:46:38 +08:00
mazong1123
01f3d09f9f
Updated the value of GTEST_DIR to reflect the googletest dir.
2016-05-15 21:32:56 +08:00
mazong1123
2746b57f78
Changed the GTestDir marco value to reflect the new dir of googletest.
2016-05-15 20:48:08 +08:00
Li Peng
266a185a52
remove duplicated words
...
Signed-off-by: Li Peng <lip@dtdream.com>
2016-04-27 16:41:27 +08:00
Paul Hadfield
0098be394a
Fix typo (Inovke -> Invoke)
2016-03-08 13:40:26 +00:00
Paul Wilkinson
83d3b47acf
Fix formatting in AdvancedGuide.md
...
Put occurrences of "#include" in a code span so they are not interpreted
as headers.
Other documents were not broken because the #include was not at the
start of the line, but put them in code spans anyway just in case the
text gets refilled in the future.
2016-02-21 15:52:09 +00:00
Jacob Meacham
d4aa34b05d
Fix link that's returned when running tests. #714
2016-02-16 17:53:43 -08:00
Billy Donahue
0162ff72e8
Merge pull request #657 from audiofanatic/issue655-targetHeaderDeps
...
Add include dirs to targets if CMake version supports it
2015-12-10 17:28:00 -05:00
Billy Donahue
c1cd9c2b05
Merge pull request #650 from jpuigcerver/master
...
Added missing CMake install rules for GMock
2015-12-10 17:25:53 -05:00
Paul Rosset
a470862dbe
fixed link in googlemock documentation
2015-12-08 16:02:50 +01:00
Craig Scott
f601ee162e
Add include dirs to targets if CMake version supports it
2015-12-06 16:31:21 +11:00
Joan Puigcerver
7c8ac4886a
Added CMake install rules for GMock
2015-12-03 09:33:21 +01:00
Billy Donahue
ccd0f94e82
Merge pull request #592 from Ferenc-/master
...
Fix typo in googlemock/README.md
2015-11-30 13:49:47 -05:00
Mark Mentovai
4a8e54401e
Name the helper AsBits()
2015-11-12 10:01:06 -05:00
Mark Mentovai
cfe466a0a7
Use a templated helper to wrap the cast
...
The helper needs to be templated because its argument type can’t be
known. FloatingPointTest is instantiated with RawType = float and
RawType = double, so Bits will be an unsigned 32-bit or 64-bit type.
size_t will be either 32 or 64 bits depending on the system’s
definition, typically based on pointer size.
2015-11-11 18:26:35 -05:00
Mark Mentovai
cbce23fb86
Leave decltype(max_ulps_) alone and cast, not sure this is better
2015-11-11 17:44:12 -05:00
Mark Mentovai
8b085f0d21
Fix warnings encountered in MSVC build of gtest/gmock tests
...
This fixes these warnings:
…\gtest\googletest\test\gtest-port_test.cc(78) : error C2220: warning treated as error - no 'object' file generated
…\gtest\googletest\test\gtest-port_test.cc(78) : warning C4309: 'static_cast' : truncation of constant value
…\gtest\googletest\test\gtest-port_test.cc(79) : warning C4309: 'static_cast' : truncation of constant value
…\gtest\googlemock\test\gmock-matchers_test.cc(2712) : error C2220: warning treated as error - no 'object' file generated
…\gtest\googlemock\test\gmock-matchers_test.cc(2706) : while compiling class template member function 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)'
…\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to function template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)' being compiled
…\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to class template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>' being compiled
…\gtest\googlemock\test\gmock-matchers_test.cc(2712) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2714) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2716) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2717) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2718) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2721) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2723) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
2015-11-11 12:28:15 -05:00
Billy Donahue
71a26ac68b
Merge pull request #612 from mark-chromium/gmock_rtti
...
googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
2015-11-10 17:48:26 -05:00
Mark Mentovai
c8a1050704
googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
...
https://github.com/google/googletest/issues/610
2015-10-12 18:01:43 -04:00
Mark Mentovai
a0435dc687
googlemock: Support C++11 language with pre-C++11 library
...
This guards use of <type_traits> and its features with
GTEST_HAS_STD_TYPE_TRAITS_, and std::function with
GTEST_HAS_STD_FUNCTION_.
2015-10-12 17:59:11 -04:00
Marco Molteni
e35cee9698
Fix broken link to FrequentlyAskedQuestions
2015-09-23 21:08:21 +02:00
Martin Maly
210392eb27
Adding missing files to googlemock distribution.
2015-09-19 23:10:58 -07:00
Ferenc-
30846f31c5
Fix typo in googlemock/README.md
2015-09-19 00:10:55 +02:00
Billy Donahue
8cb0499b6a
Fix relative links in googlemock docs.
2015-09-17 18:22:40 -04:00
Simon Newton
39062f4e30
Fix the googlemock autotools build.
2015-09-17 08:33:43 -07:00
Billy Donahue
b78f858d0c
Include <memory> to use std::unique_ptr.
2015-09-08 02:46:25 -04:00
Billy Donahue
f19b060075
Googlemock has some tuples containing lvalue refs in its unit tests.
...
These tuples are created with make_tuple, which is given temporaries.
The make_tuple is in a function argument list.
A possibly overzealous static_assert in libc++'s std::tuple ctor
is firing in our 'Perform(make_tuple("hi"))' calls, so
we can't use its make_tuple here. Instead we will use
explicitly-constructed tuples constructed from non-temporary strings.
Workaround for llvm bug:
https://llvm.org/bugs/show_bug.cgi?id=20855
An alternative to https://github.com/google/googletest/pull/580 .
2015-09-07 22:32:56 -04:00
Billy Donahue
2eb7748e70
merge
2015-08-30 12:40:37 -04:00
Billy Donahue
23bd6d8a9b
readme merging
2015-08-30 12:36:37 -04:00
Syl
ac830d6b19
Fix gmock_doctor.py for Python3
2015-08-30 09:06:14 +02:00
Arnaud Lacombe
eff38a7a0f
googlemock: fix unified build
2015-08-26 21:50:38 -07:00
Billy Donahue
3f4e79b999
readme merging
2015-08-26 21:45:10 -04:00
Billy Donahue
37b5c297cf
readme merging
2015-08-26 18:28:20 -04:00
Billy Donahue
67f6188c8f
move ProjectHome files into root
2015-08-25 17:55:28 -04:00
Billy Donahue
affb09edf0
move googlemock files into googlemock/ subdir
2015-08-25 17:47:18 -04:00
