Arkady Shapkin
cb8ebf5c9a
Support x64 configuration for old VS2015 projects
2017-08-25 01:58:00 +03:00
Gennadiy Civil
eabd5c908d
Merge pull request #1186 from Dani-Hub/master
...
Prevent infinite loops for recursive containers like boost::filesystem::path
2017-08-24 10:50:17 -04:00
Gennadiy Civil
87327b12e9
Merge branch 'master' into master
2017-08-23 14:27:55 -04:00
Gennadiy Civil
c38baf9858
Merge pull request #1219 from KindDragon/vs-projects-fix
...
Support x64 configuration for VS2010 projects
2017-08-23 14:15:36 -04:00
Daniel Krügler
ebc7b01d89
Merge branch 'master' into master
2017-08-23 11:11:44 +02:00
Gennadiy Civil
f4abce4609
Merge branch 'master' into vs-projects-fix
2017-08-22 22:38:22 -04:00
Gennadiy Civil
863e02644b
Merge pull request #1220 from romkatv/property-matcher
...
Support ref-qualified member functions in Property().
2017-08-22 22:37:30 -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
drgler
f8514b8da3
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:41 +02:00
drgler
d93ce9d6fb
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:32 +02:00
drgler
fa3bb1a779
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:19:13 +02:00
drgler
6404d45a92
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:18:54 +02:00
Roman Perepelitsa
966b549c88
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Daniel Krügler
8304d06199
Merge branch 'master' into master
2017-08-21 20:14:09 +02:00
Gennadiy Civil
675686a139
Merge pull request #1206 from ShadowIce/methodname-in-exception
...
Add function name to exception if there's no default action
2017-08-21 10:37:53 -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
Gennadiy Civil
35737ac7ac
Merge branch 'master' into methodname-in-exception
2017-08-18 16:26:02 -07:00
Gennadiy Civil
780bae0fac
Merge pull request #1215 from henryiii/patch-1
...
Adding CMake visibility policy setting
2017-08-18 16:25:03 -07:00
Henry Schreiner
5518a1d350
Adding CMake visibility policy setting
...
This policy setting will silence a warning when using with a visibility settings on targets. Due to the forced `cmake_minimum_version`, policy settings in CMakeLists calling this one (including the main CMakeLists) are lost, forcing the change to be made here.
2017-08-18 15:18:58 -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
Gennadiy Civil
1183503d11
Merge branch 'master' into methodname-in-exception
2017-08-17 09:08:37 -07:00
Gennadiy Civil
1fe692ce49
Update README.md
...
Another AppVeyor move
2017-08-16 23:42:53 -07:00
Gennadiy Civil
8f233a74eb
Merge branch 'master' into methodname-in-exception
2017-08-16 15:27:29 -07:00
Gennadiy Civil
b7e8a993b4
Merge pull request #1205 from mwoehlke-kitware/fix-gtest-install
...
Fix problem installing gtest when gmock enabled
2017-08-16 11:26:58 -07:00
Maurice Gilden
5b4166f05f
Add function name to exception if there's no default action
2017-08-16 17:53:16 +02:00
Matthew Woehlke
9469fb687d
Fix problem installing gtest when gmock enabled
...
Fix a bug deciding whether to enable the option to install Google Test
caused by one of the dependent option dependencies not being defined
yet.
Fixes #1198 ; impossible to install Google Test if Google Mock is built.
2017-08-16 10:49:06 -04:00
Gennadiy Civil
5ed471caec
Merge pull request #1204 from gennadiycivil/master
...
Changing Build Status AppVeyor badge with AppVeyor ownership change
2017-08-14 16:05:27 -07:00
Gennadiy Civil
08b1a1f73c
Merge branch 'master' into master
2017-08-14 15:29:51 -07:00
misterg
3f3a3ada20
Change AppVeyor Status Badge to point to new AppVeyor Project Location
2017-08-14 18:22:03 -04:00
misterg
a4121dd54b
Change AppVeyor Status Badge to point to new AppVeyor Project Location
2017-08-14 18:21:07 -04:00
Gennadiy Civil
e0fc65c5fb
Merge pull request #1197 from SoapGentoo/pkgconfig
...
Add support for pkgconfig
2017-08-14 14:33:41 -04:00
David Seifert
9cacce4e5c
Add documentation for pkg-config
2017-08-14 13:45:56 +02:00
David Seifert
8604c4adac
Add support for pkgconfig
2017-08-14 13:45:56 +02:00
Gennadiy Civil
673c975a96
Merge pull request #905 from iignatev/master
...
enable null detection on Solaris Studio 12u4+
2017-08-13 21:34:10 -04:00
Gennadiy Civil
9816b96a6d
Merge pull request #857 from KindDragon/patch-1
...
Add links to IRC channel and Google Group
2017-08-11 11:29:50 -04:00
Gennadiy Civil
c7f4849c0b
Merge pull request #919 from delaitre/patch-1
...
Fix the link to the float comparison article
2017-08-11 10:39:13 -04:00
Gennadiy Civil
052df998c4
Merge pull request #749 from nholthaus/patch-1
...
Documentation change to add related open source project
2017-08-11 10:38:05 -04: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
c81be0f6fc
Merge pull request #871 from tommyleo2/master
...
Update Primer.md
2017-08-10 21:34:15 -04:00
Gennadiy Civil
c523461f3a
Merge pull request #937 from srz-zumix/fix-gtest-port-typo
...
Fix or condition typo ( '|' -> '||' )
2017-08-10 21:30:13 -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
1579064390
Merge pull request #1127 from zulkarnine/patch-1
...
Fix background color in ColoredPrintf
2017-08-10 20:43:26 -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
misterg
97a8498873
Addressing Comments
2017-08-10 16:33:22 -04:00
misterg
c3f65335b7
Addressing comments
2017-08-10 15:33:09 -04:00
drgler
b11b2e403e
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-10 21:19:31 +02:00
drgler
07bba78a5f
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-10 21:18:22 +02:00
Gennadiy Civil
4e284ee657
Update WORKSPACE
...
Remove comments
2017-08-10 14:47:24 -04:00
Herbert Thielen
dc7214f222
say "former version" instead of "released version"
2017-08-10 20:21:46 +02: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
Gennadiy Civil
75f0723c45
Merge pull request #1178 from aninf-wo/hethi/testsuite-hint
...
add note about different definitions of Test Case
2017-08-10 09:13:45 -04:00
Herbert Thielen
c09e9e646d
clarify distinction regarding Test Case
2017-08-10 10:08:08 +02: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
drgler
2606c7a670
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-09 19:11:11 +02:00
drgler
71ca4bae10
Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521 : Add is_same type trait and prevent infinite loops for recursive containers
2017-08-09 19:08:22 +02:00
drgler
484ec91c22
Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521 : Add is_same type trait
2017-08-09 19:07:22 +02: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
misterg
ac885f3ab2
WIP
2017-08-09 11:47:54 -04:00
Herbert Thielen
33edcaed89
be more specific on Test Case
2017-08-09 16:41:38 +02:00
Gennadiy Civil
b322d1d91d
Merge pull request #1185 from eduherminio/master
...
Fix punctuation in docs
2017-08-09 10:28:35 -04:00
Eduardo Cáceres
67fcf00703
Punctuation
...
Missing periods
2017-08-09 14:10:23 +02: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
misterg
ab8f2b0d09
WIP, win testing
2017-08-08 15:54:36 -04:00
misterg
e66b6bc868
WIP, win testing
2017-08-08 15:41:44 -04:00
misterg
40a909b4e5
WIP, windows testing
2017-08-08 15:37:38 -04:00
misterg
a2006b2ab0
WIP, windows testing
2017-08-08 15:34:40 -04:00
misterg
c75de0aa92
WIP, windows testing
2017-08-08 15:32:30 -04:00
misterg
8815087cfa
WIP
2017-08-08 15:17:56 -04:00
Gennadiy Civil
6ae9cc7894
Merge pull request #925 from edgarriba/patch-1
...
update README.md with tiny-dnn
2017-08-08 11:58:02 -04:00
Gennadiy Civil
40aa72c7dc
Merge pull request #675 from theHacker/master
...
Fix: Markdown in V1_7_Primer.md
2017-08-08 11:53:40 -04:00
Gennadiy Civil
f8d909d095
Merge pull request #1173 from shlomif/correct-typo
...
Correct some typos in a comment
2017-08-07 23:06:00 -04:00
Gennadiy Civil
22d1a7a1a7
Merge pull request #909 from AsturaPhoenix/patch-1
...
Update Primer.md
2017-08-07 23:01:42 -04:00
Gennadiy Civil
7890f7215e
Merge pull request #1180 from aconverse/master
...
Use wider types to prevent unsigned overflow diagnostics
2017-08-07 15:37:15 -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
misterg
aecea3842c
Samples changes upstreaming
2017-08-07 13:25:03 -04:00
misterg
52a9c14c48
Samples changes upstreaming
2017-08-07 13:20:57 -04:00
Herbert Thielen
0f702cebb0
add note about different definitions of Test Case
...
There are contradictory definitions of the term "test case", so prepare
new users in Primer.md to avoid confusion.
2017-08-05 15:12:12 +02:00
Herbert Thielen
212f4d793e
fix small typo in comment
2017-08-05 12:42:00 +02:00
Shlomi Fish
aac403334d
Correct some typos in a comment
2017-08-04 10:39:35 +03:00
Alex Converse
deb99a9d26
Use wider types to prevent unsigned overflow diagnostics
...
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
2017-08-03 14:12:25 -07: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
