Commit Graph

1476 Commits

Author SHA1 Message Date
drgler
0d121065b4 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-10 21:18:22 +02:00
Gennadiy Civil
73f7b07fb7 Update WORKSPACE
Remove comments
2017-08-10 14:47:24 -04:00
Herbert Thielen
89bd69dff5 say "former version" instead of "released version" 2017-08-10 20:21:46 +02:00
Eduardo Caceres
fccdf51ece Minor style fixes
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
4d386daead Added Copyright 2017-08-10 12:03:27 -04:00
misterg
a7b338585e Initial Revision, review 164634031 2017-08-10 11:54:46 -04:00
Alyssa Wilk
10232c3adb Adding a flag option to change the default mock type 2017-08-10 09:41:09 -04:00
Gennadiy Civil
d47ef4b7dc 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
23c3feba97 clarify distinction regarding Test Case 2017-08-10 10:08:08 +02:00
Matthew Woehlke
92b6ea3c94 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
45b059daae WIP 2017-08-09 14:37:58 -04:00
drgler
c495acc6e1 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-09 19:11:11 +02:00
drgler
ec538fc0b8 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
635ccb98a7 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
66a9ab3d98 Added googlemock tests 2017-08-09 12:18:12 -04:00
misterg
abdad087f6 Added googlemock tests 2017-08-09 12:15:00 -04:00
misterg
dd94055b01 WIP 2017-08-09 11:47:54 -04:00
Herbert Thielen
646ebe5ad5 be more specific on Test Case 2017-08-09 16:41:38 +02:00
Gennadiy Civil
5b1afde7b3 Merge pull request #1185 from eduherminio/master
Fix punctuation in docs
2017-08-09 10:28:35 -04:00
Eduardo Cáceres
bd84341086 Punctuation
Missing periods
2017-08-09 14:10:23 +02:00
Herbert Thielen
fc59509590 Merge branch 'master' into hethi/remove-old-docs 2017-08-09 11:03:27 +02:00
Gennadiy Civil
fdab6ef84e Merge pull request #1123 from chromy/upstream-141765019
Fix typo in gmock-actions.h
2017-08-08 16:17:52 -04:00
Gennadiy Civil
124944bfe4 Merge pull request #1122 from chromy/upstream-146491438
Fixed misspelling in assertion message.
2017-08-08 16:15:57 -04:00
misterg
3ea266427c WIP, win testing 2017-08-08 15:54:36 -04:00
misterg
a19732de6c WIP, win testing 2017-08-08 15:41:44 -04:00
misterg
5b99572967 WIP, windows testing 2017-08-08 15:37:38 -04:00
misterg
96a7912d63 WIP, windows testing 2017-08-08 15:34:40 -04:00
misterg
bc27e2643a WIP, windows testing 2017-08-08 15:32:30 -04:00
misterg
071e87fbcc WIP 2017-08-08 15:17:56 -04:00
Gennadiy Civil
9974b5c73a Merge pull request #925 from edgarriba/patch-1
update README.md with tiny-dnn
2017-08-08 11:58:02 -04:00
Gennadiy Civil
f9f759c7b6 Merge pull request #675 from theHacker/master
Fix: Markdown in V1_7_Primer.md
2017-08-08 11:53:40 -04:00
Gennadiy Civil
dda806444e Merge pull request #1173 from shlomif/correct-typo
Correct some typos in a comment
2017-08-07 23:06:00 -04:00
Gennadiy Civil
e016e565a7 Merge pull request #909 from AsturaPhoenix/patch-1
Update Primer.md
2017-08-07 23:01:42 -04:00
Gennadiy Civil
01d23ced95 Merge pull request #1180 from aconverse/master
Use wider types to prevent unsigned overflow diagnostics
2017-08-07 15:37:15 -04:00
David Benjamin
8a1825baa7 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
b8f003a2ba Merge pull request #1176 from aninf-wo/hethi/typo
fix small typo in comment
2017-08-07 13:33:08 -04:00
misterg
926d53898a Samples changes upstreaming 2017-08-07 13:25:03 -04:00
misterg
2c54f2bb44 Samples changes upstreaming 2017-08-07 13:20:57 -04:00
Herbert Thielen
16e8218b47 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
8dd8fb0e4a fix small typo in comment 2017-08-05 12:42:00 +02:00
Shlomi Fish
77dfa1e00f Correct some typos in a comment 2017-08-04 10:39:35 +03:00
Alex Converse
be0d00e733 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
04e2d9246e Merge pull request #1030 from vpfautz/master
Fixed some typos
2017-08-03 16:49:13 -04:00
Gennadiy Civil
8c478025bd Merge pull request #1172 from joelypoley/joelypoley-patch-1
Fix cmake policy issue
2017-08-03 00:00:15 -04:00
Joel Laity
a824aeccf0 Fixed cmake policy issue 2017-08-03 15:50:45 +12:00
Gennadiy Civil
c3b2c4bc44 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
dec70d6cb2 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
b0eda8c2ca Fix policy issue with old cmakes
#1169
2017-08-02 21:03:13 -04:00
Gennadiy Civil
d24899d1d3 Merge pull request #867 from marzojr/patch-1
Clarifying documentation language
2017-08-02 17:09:05 -04:00
Gennadiy Civil
e51a2f1ab1 Merge pull request #671 from mehagar/patch-1
Fix typo in AdvancedGuide.md
2017-08-02 17:07:27 -04:00