1351 Commits

Author SHA1 Message Date
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
gpetit
ca76206f42 Removed extra colon in error log 2017-08-14 15:30:01 -04:00
Gennadiy Civil
e0fc65c5fb Merge pull request #1197 from SoapGentoo/pkgconfig
Add support for pkgconfig
2017-08-14 14:33:41 -04:00
gpetit
0c3c811164 Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf 2017-08-14 13:45:45 -04:00
gpetit
8f04622cc1 Use GTEST_LOG instead of printf 2017-08-14 13:45:27 -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
Che-Hsun Liu
24696c3958 Merge branch 'master' into master 2017-08-14 14:51:49 +08: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
Alyssa Wilk
6e1970e237 Adding a flag option to change the default mock type 2017-08-10 09:41:09 -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
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
misterg
aa31cb67c2 WIP 2017-08-02 15:40:14 -04:00
misterg
6615f7df11 WIP 2017-08-02 14:36:39 -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
misterg
b3edada290 WIP 2017-08-01 14:50:59 -04:00
misterg
f63e2a14a2 WIP 2017-08-01 14:36:29 -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
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
Herbert Thielen
b3908406e6 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:26:29 +02:00
Herbert Thielen
f6ac9a30a4 remove obsolete reference to SVN trunk 2017-07-30 16:25:58 +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
Zulkarnine Mahmud
2960aa54e2 Remove duplicate code 2017-07-16 21:59:26 +09:00