zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,351 Commits 10 Branches 30 Tags
23a014ab578682ae11c3e68c77a1cde3b77f7a90
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil cc372a071b Merge pull request #1340 from coryan/fix-googlemock-test-build-file 
Add licenses() directive for googlemock/tests.
 2017-12-08 13:03:20 -05:00
Gennadiy Civil 4d1f930af8 Merge pull request #1345 from coryan/fix-travis-build-macOS 
Fix Travis build
 2017-12-08 11:09:01 -05:00
Gennadiy Civil efc6abae67 Merge branch 'master' into fix-travis-build-macOS 2017-12-08 11:08:54 -05:00
Gennadiy Civil 887a6c6420 Merge pull request #1348 from wmamrak/master 
Remove C4996 warning in VS2017
 2017-12-08 11:08:17 -05:00
Gennadiy Civil a868e618c0 Merge pull request #1225 from brian-peloton/master 
Speed up printing of characters which need hex escaping
 2017-12-05 17:19:23 -05:00
Gennadiy Civil 9e236748fb Merge branch 'master' into master 2017-12-01 16:41:53 -05:00
Gennadiy Civil 247a3d8e5e Merge pull request #1324 from whame/master 
Fix issue #826 by treating MinGW as "non-Windows" when determining colored output
 2017-12-01 16:27:33 -05:00
Gennadiy Civil d175c8bf82 Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312 
remove markdown stars (bold) from code examples
 2017-10-30 11:18:33 -04:00
Gennadiy Civil 43d6ad75bc Merge pull request #1308 from KindDragon/vs2017-ci 
Enable CI for VS2017
 2017-10-30 11:11:38 -04:00
Gennadiy Civil 3121b2049e Merge pull request #1304 from m-gupta/gtestapifix 
googletest: Add GTEST_API_ attribute to ThreadLocal class.
 2017-10-25 15:57:21 -04:00
Gennadiy Civil e93a15c5a5 Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-warning 
Remove gcc 6 misleading indentations warnings
 2017-10-25 13:51:48 -04:00
Gennadiy Civil 7684db3271 Merge pull request #1218 from KindDragon/vs-build-fix 
VS2015/2017 build fix and enable C++11 features (attempt number three)
 2017-10-25 10:33:54 -04:00
Gennadiy Civil 6d0bb75c81 Merge pull request #1139 from chehsunliu/master 
Update the CMakeLists.txt section in googletest README.md.
 2017-10-24 11:27:04 -04:00
Gennadiy Civil c208d8df23 Merge branch 'master' into master 2017-10-20 17:25:41 -04:00
Gennadiy Civil 69e48e92de Merge pull request #1300 from gennadiycivil/master 
Workaround for Travis issue https://goo.gl/d5eV8o
 2017-10-18 16:24:59 -04:00
Gennadiy Civil 48986f9d4c Merge branch 'master' into master 2017-10-18 16:22:29 -04:00
Gennadiy Civil 54c2648bff Workaround for Travis issue https://goo.gl/d5eV8o 2017-10-18 16:18:47 -04:00
Gennadiy Civil 27be0dfb53 Merge pull request #1298 from google/revert-1297-master 
Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…"
 2017-10-18 10:42:49 -04:00
Gennadiy Civil 34aaf58c8b Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…" 2017-10-18 10:42:33 -04:00
Gennadiy Civil 5c9543547e Merge pull request #1297 from gennadiycivil/master 
Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…
 2017-10-18 10:40:53 -04:00
Gennadiy Civil dfed97a69a Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552 2017-10-18 10:40:00 -04:00
Gennadiy Civil 3282f9ae01 Merge pull request #1288 from joealam/master 
Updated README with C runtime dynamic/static linking issues in Windows info
 2017-10-15 19:15:31 -07:00
Gennadiy Civil 963932e7f3 Merge pull request #1292 from DariuszOstolski/master 
#1282: Doc typo fix
 2017-10-15 19:14:33 -07:00
Gennadiy Civil 7b6561c56e Merge pull request #1275 from jwakely/pr/1273 
Use gender-neutral pronouns in comments and docs
 2017-10-03 10:57:19 -04:00
Gennadiy Civil f1a87d73fc Merge pull request #1249 from stkhapugin/master 
Make TypeWithoutFormatter compatible with Objective-C++ with ARC.
 2017-09-23 16:21:02 -07:00
Gennadiy Civil 89f45180e0 Merge branch 'master' into master 2017-09-23 16:51:27 -04:00
Gennadiy Civil bfc0ffc8a6 Merge pull request #1271 from google/revert-1245-2017_09_04_parametrized 
Revert "Allow macros inside of parametrized test names."
 2017-09-21 10:54:35 -04:00
Gennadiy Civil d30a37e743 Revert "Allow macros inside of parametrized test names." 2017-09-21 10:54:14 -04:00
Gennadiy Civil ff6796877f Merge pull request #1245 from sheepmaster/2017_09_04_parametrized 
Allow macros inside of parametrized test names.
 2017-09-21 10:52:47 -04:00
Gennadiy Civil 4386393837 Merge pull request #1265 from bkircher/redundant-decl 
Remove redundant declaration
 2017-09-20 14:32:57 -04:00
Gennadiy Civil deace2546e Merge pull request #1259 from ly2048/patch-1 
Add explicit `CMAKE_DEBUG_POSTFIX` option
 2017-09-14 22:30:24 -04:00
Gennadiy Civil b1dd47c278 Merge pull request #1255 from yursha/patch-1 
Fix ellipsis position in examples
 2017-09-14 11:10:51 -04:00
Gennadiy Civil 20e62ad24c Merge pull request #1242 from DarthGandalf/expect 
Make the failure messages from EXPECT_EQ and friends actually symmetric (reopen of #1101)
 2017-09-13 16:33:18 -04:00
Gennadiy Civil 6133038886 Merge pull request #1227 from aninf-wo/hethi/unused-import 
remove unused TestCase import
 2017-09-12 08:44:58 -04:00
Gennadiy Civil ecc5182dbd Merge pull request #1250 from aninf-wo/hethi/remove-linker-warning-on-non-existing-path 
remove obsolete link_directories command
 2017-09-11 12:15:11 -04:00
Gennadiy Civil eb695b0f11 Merge branch 'master' into hethi/unused-import 2017-09-11 11:02:44 -04:00
Gennadiy Civil 3663d67170 Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printf 
User logger GTEST_LOG instead of printf in gtest.cc to log errors
 2017-09-11 10:53:09 -04:00
Gennadiy Civil def0b32119 Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environment 
remove unused variables from travis environment
 2017-09-08 07:15:19 -04:00
Gennadiy Civil 894cdb82cb Merge pull request #1251 from aninf-wo/hethi/drop-valgrind-installation-on-travis 
drop unused valgrind package from Travis build slave installation
 2017-09-07 23:04:18 -04:00
Gennadiy Civil f3500ce23a Merge pull request #1243 from aninf-wo/hethi/travis-release-build 
switch one Trevis build to Release mode
 2017-09-07 23:03:09 -04:00
Gennadiy Civil a33b6b0919 Merge pull request #1246 from aninf-wo/hethi/enable-travis-gcc-cache 
enable Travis ccache to speed up CI builds
 2017-09-06 16:52:22 -04:00
Gennadiy Civil 8a3ccc3ee3 Merge pull request #1247 from aninf-wo/hethi/enable-parallel-builds 
run parallelized builds on Travis CI
 2017-09-06 14:27:07 -04: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
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 ee53b281ba Merge branch 'master' into user_logger_instead_of_printf 2017-09-01 00:05:22 -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 4db9a748e3 Merge branch 'master' into hethi/unused-import 2017-08-30 11:47:32 -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