zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,273 Commits 10 Branches 30 Tags
2fe3bd994b3189899d93f1d5a881e725e046fdc2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil 2fe3bd994b Merge pull request #1433 from dsacre/fix-clang-warnings 
Fix Clang warnings
 2018-08-31 11:21:57 -04:00
Gennadiy Civil d615eebd9f Merge branch 'master' into fix-clang-warnings 2018-08-31 10:57:16 -04:00
Gennadiy Civil 4005388b3b Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-08-31 10:50:06 -04:00
Gennadiy Civil 6dd60ec437 Update googletest-output-test-golden-lin.txt 2018-08-31 10:26:59 -04:00
Gennadiy Civil 76af254c47 Update googletest-output-test-golden-lin.txt 
manual update golden lin
 2018-08-30 21:46:15 -04:00
Gennadiy Civil 0ecf38f3a2 Update googletest-output-test-golden-lin.txt 
manual update, golden lin
 2018-08-30 21:42:07 -04:00
Gennadiy Civil b8e2562086 Merge pull request #1790 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-08-29 22:57:12 -04:00
Gennadiy Civil 9ad739833e Update gmock-matchers.h 2018-08-29 22:32:08 -04:00
Gennadiy Civil 1db4a426d4 Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4 2018-08-29 22:07:39 -04:00
Gennadiy Civil f1e529a808 clang 3.7 -> 3.9 2018-08-29 21:52:07 -04:00
Gennadiy Civil d7d21c0b91 clang 3.7->3.9 2018-08-29 21:51:31 -04:00
Gennadiy Civil a83e98d0e7 Update .travis.yml 
Bring travil yml back to the master branch state
 2018-08-29 21:21:42 -04:00
Gennadiy Civil 964748a902 Update .travis.yml 2018-08-29 21:16:33 -04:00
Gennadiy Civil e8ebde4f21 Testing, trying to figure out clang errors 
Possibly related to travis env
 2018-08-29 12:37:54 -04:00
Gennadiy Civil 3d56121825 Merge pull request #1794 from BlueMonday/patch-1 
Fix broken FAQ link in primer.md
 2018-08-29 00:43:34 -04:00
Gennadiy Civil e103fa4f2a Disable MCVS warnings 2018-08-28 23:55:17 -04:00
Gennadiy Civil 9b2016a01d typo 2018-08-28 23:46:23 -04:00
Gennadiy Civil e8e26d25bd typo 2018-08-28 23:36:50 -04:00
Gennadiy Civil 8c0e0d5c17 MSVC warnings silence 2018-08-28 23:25:51 -04:00
Gennadiy Civil 9d9d7a6a89 Update googletest-output-test-golden-lin.txt 2018-08-28 23:11:51 -04:00
Gennadiy Civil 58f3f1005c Merge pull request #1784 from DavidSchuldenfrei/add-adapter-to-readme 
New Readme.md
 2018-08-27 22:50:46 -04:00
Gennadiy Civil 2e68926a9d Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemock 
Use `$<INSTALL_PREFIX>` in `target_include_directories`
 2018-08-27 14:13:59 -04:00
Gennadiy Civil ebb2fca51a Merge branch 'master' into fix-1764_CMake-errors-in-googlemock 2018-08-27 13:25:45 -04:00
Gennadiy Civil 641e7a3752 Update CONTRIBUTING.md 2018-08-27 13:06:43 -04:00
Gennadiy Civil 9c96f500a3 Merge pull request #1781 from wfvining/fix1764-cmake-errors 
Fix #1764 Remove cmake code that leads to a configuration error
 2018-08-24 16:49:47 -04:00
Gennadiy Civil c3d9db428a Update README.md 2018-08-24 13:25:40 -04:00
Gennadiy Civil bf98ce2bba Merge pull request #1767 from jschloss-swift/issue_1735 
Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
 2018-08-24 11:56:17 -04:00
Gennadiy Civil 205df1058e Merge branch 'master' into issue_1735 2018-08-24 11:30:02 -04:00
Gennadiy Civil 7f11b9ffb5 Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-08-23 20:00:01 -04:00
Gennadiy Civil 1d9a1912e7 Merge pull request #1338 from stefanosoffia/master 
Install CMake export files
 2018-08-22 13:05:06 -04:00
Gennadiy Civil 880896c6f4 Merge pull request #1682 from dakotahawkins/improve-exported-targets 
Improve CMake exported targets
 2018-08-21 13:51:42 -04:00
Gennadiy Civil b88511ef64 Merge pull request #1194 from joshbodily/josh/fix_scoped_class2 
Fix scoped enum not working in gmock-gen.py
 2018-08-21 10:32:21 -04:00
Gennadiy Civil a6e7ba27c7 Merge branch 'master' into josh/fix_scoped_class2 2018-08-20 16:15:04 -04:00
Gennadiy Civil 735bd75f69 Update CONTRIBUTING.md 2018-08-20 16:08:33 -04:00
Gennadiy Civil ecd844de90 Merge pull request #1759 from gennadiycivil/master 
merge
 2018-08-20 15:42:27 -04:00
Gennadiy Civil 9404c5ae04 Merge pull request #1754 from vkotovv/docs-advanced-broken-links 
docs: fixed broken references to sections in Advanced guide
 2018-08-20 11:04:11 -04:00
Gennadiy Civil 49e6a9b771 Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116 
Allow death test child to bypass Windows Error Reporting under MinGW
 2018-08-20 10:50:41 -04:00
Gennadiy Civil c1230dea6b Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-20 10:21:32 -04:00
Gennadiy Civil 1778f2091e Merge pull request #1347 from Burgch/fix-argc 
Fix value pointed to by `_NSGetArgc()` on macOS.
 2018-08-19 14:16:03 -04:00
Gennadiy Civil 97274b1e94 Merge branch 'master' into fix-argc 2018-08-19 14:03:30 -04:00
Gennadiy Civil a946f7db03 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-18 13:15:35 -04:00
Gennadiy Civil d1c1aac781 Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning 
Remove default /EHsc compiler flag
 2018-08-17 23:27:19 -04:00
Gennadiy Civil 85b572394b Merge pull request #1652 from medithe/patch-1 
Cast the tr1::tuple_element template parameter to int
 2018-08-17 23:05:00 -04:00
Gennadiy Civil 2a380bc26d Merge branch 'master' into patch-1 2018-08-17 15:45:35 -04:00
Gennadiy Civil e82d320567 Merge pull request #1748 from laixer/std 
std references shouldn't be fully qualified
 2018-08-17 15:44:11 -04:00
Gennadiy Civil cda442da0b Formatting 2018-08-17 13:44:48 -04:00
Gennadiy Civil edc1bc606e Merge branch 'master' into patch-1 2018-08-17 13:31:01 -04:00
Gennadiy Civil 88cd66513c Minor formatting/style changes 2018-08-17 13:25:52 -04:00
Gennadiy Civil a9bd428e72 Merge branch 'master' into fix-msvc-d9025-warning 2018-08-17 11:48:56 -04:00
Gennadiy Civil 02a8ca8773 Merge pull request #1546 from henryiii/cleanup-cmake 
Clean up cache non-advanced variable for subproject
 2018-08-17 10:27:13 -04:00
Gennadiy Civil f87798a3f7 Merge pull request #1646 from tisi1988/master 
FIX: Compilation warning with GCC regarding a non-initialised member …
 2018-08-16 15:28:20 -04:00
Gennadiy Civil d20fa182a6 was not quite right, 
Fomatting
 2018-08-16 15:11:40 -04:00
Gennadiy Civil b1bfdf0bf4 Small formatting change 
And then we can merge
 2018-08-16 15:10:07 -04:00
Gennadiy Civil 8c86040dd6 Merge branch 'master' into master 2018-08-16 13:37:53 -04:00
Gennadiy Civil 8b34930c62 Merge pull request #1142 from scottslacksmith/master 
Fix/silence false positive memory leaks reported by Microsoft's debug CRT
 2018-08-16 13:34:03 -04:00
Gennadiy Civil c38f4b9f2c Small style changes. 
Just small style changes and we can accept this PR
 2018-08-16 13:18:13 -04:00
Gennadiy Civil 21e518557a Merge branch 'master' into josh/fix_scoped_class2 2018-08-16 11:13:12 -04:00
Gennadiy Civil f3a9fa6a62 Merge branch 'master' into master 2018-08-16 10:39:40 -04:00
Gennadiy Civil 1dad4cf521 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-16 10:35:56 -04:00
Gennadiy Civil 490554aa0f Merge pull request #1746 from google/B60C9E9743233AA81897617B277709DF 
googletest export
 2018-08-15 19:24:13 -04:00
Gennadiy Civil 1246e5807a Merge branch 'master' into cleanup-cmake 2018-08-15 13:02:54 -07:00
Gennadiy Civil 2172c08c92 Merge pull request #1697 from morris-stock/ignore-cmake-generated-files 
Ignore cmake generated files when used as submodule
 2018-08-15 11:39:13 -07:00
Gennadiy Civil 3c4f437c24 Merge branch 'master' into master 2018-08-15 11:33:15 -07:00
Gennadiy Civil 06b9759288 Merge branch 'master' into ignore-cmake-generated-files 2018-08-15 10:17:09 -07:00
Gennadiy Civil 7e7e3a6f45 Merge branch 'master' into patch-1 2018-08-15 08:37:15 -07:00
Gennadiy Civil 997d343dd6 Merge pull request #1734 from eliasdaler/cmake-binary-dir-fix 
Change location of pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR
 2018-08-15 08:26:25 -07:00
Gennadiy Civil 02671abb44 Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 14:25:05 -07:00
Gennadiy Civil 587ceaeaee Merge pull request #1741 from gennadiycivil/master 
Comments changes, no functionality changes.
 2018-08-14 14:24:01 -07:00
Gennadiy Civil e26771776b Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 12:55:13 -07:00
Gennadiy Civil 3306848f69 Merge pull request #1740 from gennadiycivil/master 
Comments changes, no functionality changes
 2018-08-14 11:18:43 -07:00
Gennadiy Civil 41fec55881 Merge pull request #1665 from rongjiecomputer/deprecate 
Disable MSVC function deprecation when using Clang
 2018-08-14 10:48:11 -07:00
Gennadiy Civil 2421eff9f7 Merge branch 'master' into deprecate 2018-08-14 08:47:13 -07:00
Gennadiy Civil 17714d65e1 Merge pull request #1738 from gennadiycivil/master 
Code formatting changes, clean up, no functionality changes
 2018-08-14 08:21:59 -07:00
Gennadiy Civil 15ef6ec064 Merge pull request #1733 from gennadiycivil/master 
Move instructions into custom/README files
 2018-08-14 07:55:28 -07:00
Gennadiy Civil caeaef302d Merge branch 'master' into master 2018-08-14 07:42:41 -07:00
Gennadiy Civil 8bc11c040a Merge pull request #924 from wind-river-cdt/cross-testing-patch-1 
Fix #923 - support CMAKE_CROSSCOMPILING_EMULATOR for tests
 2018-08-13 13:20:07 -07:00
Gennadiy Civil 47b57ff1b2 Merge branch 'master' into cross-testing-patch-1 2018-08-13 11:38:32 -07:00
Gennadiy Civil 7800ba3eea Merge pull request #1732 from gennadiycivil/master 
comment cleanup
 2018-08-13 10:18:11 -07:00
Gennadiy Civil 65b42fa615 Merge pull request #1731 from 2power10/master 
Fix the bad format issues in docs/advanced.md
 2018-08-13 07:26:29 -07:00
Gennadiy Civil ae94a9097d Merge pull request #1727 from gennadiycivil/master 
Mode change on a python script
 2018-08-10 13:09:36 -07:00
Gennadiy Civil 8cccb2a718 Update README.md 2018-08-10 15:20:51 -04:00
Gennadiy Civil 9cb381952e Merge pull request #1726 from google/gennadiycivil-patch-2 
Feature forward plans -  README.md
 2018-08-10 12:20:10 -07:00
Gennadiy Civil b1236528fe Update README.md 2018-08-10 12:05:17 -04:00
Gennadiy Civil 77ac31c35f Update README.md 2018-08-10 11:30:04 -04:00
Gennadiy Civil 4de527dc2c Update README.md 2018-08-10 11:29:18 -04:00
Gennadiy Civil 945618b202 Update README.md 2018-08-10 11:06:52 -04:00
Gennadiy Civil e821a2db23 Update README.md 2018-08-10 10:59:52 -04:00
Gennadiy Civil 6b6be9457b Merge pull request #1725 from google/gennadiycivil-patch-1 
Update gmock_output_test.py, formatting
 2018-08-09 12:54:07 -07:00
Gennadiy Civil 5eb263569b Update gmock_output_test.py 2018-08-09 15:24:43 -04:00
Gennadiy Civil b46b86ee60 Merge pull request #1719 from happyCoder92/master 
docs: fix broken links
 2018-08-09 10:54:09 -07:00
Gennadiy Civil 6b89cb06a7 Merge pull request #1724 from gennadiycivil/master 
formatting and small changes related to code management
 2018-08-09 10:53:58 -07:00
Gennadiy Civil 4e13415ff4 Merge branch 'master' into master 2018-08-09 10:40:06 -07:00
Gennadiy Civil 4843eafd9e Merge pull request #1723 from gennadiycivil/master 
code management comments,
 2018-08-09 09:23:00 -07:00
Gennadiy Civil 71c2bb4a97 Merge branch 'master' into master 2018-08-09 09:22:40 -07:00
Gennadiy Civil 33596cb5c3 Merge pull request #1721 from gennadiycivil/master 
Fixing identation, causes build errors when warnings are treated as errors
 2018-08-09 09:11:18 -07:00
Gennadiy Civil d5b31df900 Update gtest-death-test.cc 2018-08-09 11:33:42 -04:00
Gennadiy Civil 2797ba8f91 Merge pull request #1720 from gennadiycivil/master 
Formatting change for auto code management, no functionality changes
 2018-08-09 07:53:26 -07:00
Gennadiy Civil 4de57ce787 Merge pull request #1714 from gennadiycivil/master 
Formatting tweaks, no functionality changes
 2018-08-08 12:47:02 -07:00
Gennadiy Civil 541eeb4b40 Merge branch 'master' into master 2018-08-08 12:19:55 -07:00
Gennadiy Civil 11f5a2740a Merge branch 'master' into cross-testing-patch-1 2018-08-08 12:19:04 -07:00