 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 |
|
|
Gennadiy Civil
|
52b6ca3428
|
Merge pull request #783 from tobbi/cppcheck_perf_fixes
Performance fixes reported by cppcheck
|
2017-09-01 13:52:33 -04: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 |
|
|
Gennadiy Civil
|
b3a1f87f0c
|
Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-type
use cmake build type defined in .travis.yml for travis builds
|
2017-09-01 10:07:43 -04:00 |
|
|
Gennadiy Civil
|
69e794ca75
|
Merge pull request #870 from KindDragon/mingw64-appveyour
AppVeyor MinGW-w64 test build
|
2017-09-01 00:04:34 -04:00 |
|
|
Gennadiy Civil
|
836c194a81
|
Merge pull request #1241 from aninf-wo/hethi/issue-635-old-links
change links from former code.google.com to current github repository
|
2017-08-31 18:28:19 -04:00 |
|
|
Gennadiy Civil
|
92e920730d
|
Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-comment
fix example's comment
|
2017-08-31 12:10:49 -04:00 |
|
|
Gennadiy Civil
|
7f27d8bdd1
|
Merge branch 'master' into hethi/issue-1175-cmake-build-type
|
2017-08-31 11:13:09 -04:00 |
|
|
Gennadiy Civil
|
a430e9c176
|
Merge pull request #865 from frosteyes/master
Moved the ignoring of *.pyc files to top level
|
2017-08-31 09:13:07 -04:00 |
|
|
Gennadiy Civil
|
16bfba08e2
|
Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake
remove non-existing gmock_build_samples switch
|
2017-08-30 22:18:24 -04:00 |
|
|
Gennadiy Civil
|
7f8fefabed
|
Merge pull request #1237 from sgraham/update-docs-3
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA, plus small documentation change
|
2017-08-30 17:29:43 -04:00 |
|
|
Gennadiy Civil
|
fa70b84ab5
|
Removed "Trivial"
Who knows? may not be very trivial given the code drift between internal and OSS
|
2017-08-30 14:51:36 -04:00 |
|
|
Gennadiy Civil
|
c4e01616af
|
removed internal link ( not allowed in OSS)
|
2017-08-30 14:50:40 -04:00 |
|
|
Gennadiy Civil
|
bb1c4af487
|
Merge branch 'master' into master
|
2017-08-30 14:11:38 -04:00 |
|
|
Gennadiy Civil
|
c4ec2ac04d
|
Merge branch 'master' into hethi/travis-unused-cmake
|
2017-08-30 11:49:23 -04:00 |
|
|
Gennadiy Civil
|
5d431c650f
|
Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide
fix SetUp/TearDownTestCase() in AdvancedGuide
|
2017-08-30 08:47:10 -04:00 |
|
|
Gennadiy Civil
|
71e2858f32
|
Merge pull request #1226 from aninf-wo/hethi/fix-typo
fix typo in comment and string (SetUpTestCase)
|
2017-08-30 00:33:30 -04:00 |
|
|
Gennadiy Civil
|
5bd8e83217
|
Merge branch 'master' into hethi/fix-typo
|
2017-08-29 23:59:32 -04:00 |
|
|
Gennadiy Civil
|
298cd5e9c4
|
Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105
fix typos mentioned in issue 1105
|
2017-08-29 19:31:16 -04:00 |
|
|
Gennadiy Civil
|
b46755be30
|
Merge pull request #1229 from aninf-wo/hethi/typo-xUnit
fix typo: xUnit
|
2017-08-29 19:30:38 -04:00 |
|
|
Gennadiy Civil
|
58fd184c7f
|
Merge branch 'master' into hethi/typo-xUnit
|
2017-08-29 19:30:18 -04:00 |
|
|
Gennadiy Civil
|
c4126e0463
|
Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs
reduce travis buildjobs by 4/12
|
2017-08-29 19:27:27 -04:00 |
|
|
Gennadiy Civil
|
24ceb4f4f5
|
Merge pull request #1231 from aninf-wo/heth/travis-verbose-make
switch on verbose make in travis builds
|
2017-08-29 19:26:34 -04:00 |
|
|
Gennadiy Civil
|
30c1e00afb
|
Merge branch 'master' into hethi/typo-xUnit
|
2017-08-29 10:19:33 -04:00 |
|
|
Gennadiy Civil
|
96f3745e73
|
Merge pull request #1189 from alyssawilk/flag-default
Adding a flag option to change the default mock type
|
2017-08-29 10:18:33 -04:00 |
|
|
Gennadiy Civil
|
b43bfcf491
|
Merge pull request #1222 from KindDragon/vs-projects-fix3
Support x64 configuration for old VS2015 projects
|
2017-08-25 10:31:12 -04:00 |
|
|
Gennadiy Civil
|
a7eeb6971f
|
Merge branch 'master' into vs-projects-fix3
|
2017-08-24 22:53:22 -04:00 |
|
|
Gennadiy Civil
|
f25921565b
|
Merge pull request #1221 from KindDragon/vs-projects-fix2
Remove gtest VS2005 projects
|
2017-08-24 22:53:00 -04: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 |
|
|
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 |
|
|
Gennadiy Civil
|
96f7ba83cb
|
Merge branch 'master' into wrong-version-reported
|
2017-08-21 13:11:58 -04: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Gennadiy Civil
|
e0fc65c5fb
|
Merge pull request #1197 from SoapGentoo/pkgconfig
Add support for pkgconfig
|
2017-08-14 14:33:41 -04: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 |
|
|
Gennadiy Civil
|
4e284ee657
|
Update WORKSPACE
Remove comments
|
2017-08-10 14:47:24 -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 |
|
|
Gennadiy Civil
|
b322d1d91d
|
Merge pull request #1185 from eduherminio/master
Fix punctuation in docs
|
2017-08-09 10:28:35 -04: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|