zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,530 Commits 10 Branches 30 Tags
3cf8f514d859d65b7202e51c662a03a92887b8e2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil 3cf8f514d8 Update build badge 2018-11-20 15:00:35 -05:00
Gennadiy Civil d5932506d6 Merge pull request #1961 from coppered/patch-1 
Update README.md
 2018-11-13 21:13:21 -05:00
Gennadiy Civil 09beafcd1d Merge branch 'master' into patch-1 2018-11-13 10:52:25 -05:00
Gennadiy Civil 529c2c6f4a Merge pull request #1950 from benjamincarman/makefix 
Updating Sample Makefile to Specify C++11
 2018-11-02 14:19:07 -04:00
Gennadiy Civil 9636db6b2b Merge branch 'master' into makefix 2018-11-01 10:45:47 -04:00
Gennadiy Civil 879ac092fd Merge pull request #1948 from jerryturcios08/master 
Correct grammatical error in googlemock's README.md file
 2018-10-31 13:21:47 -04:00
Gennadiy Civil cc9dcc5412 Merge pull request #1945 from akonradi/optional-matcher-doc 
Add Optional() to the cheat sheet doc.
 2018-10-30 09:34:35 -04:00
Gennadiy Civil 8ec8ce1c8a Merge pull request #1934 from jeffvandyke/patch-2 
Change CMake googletest download location in docs
 2018-10-24 19:00:57 -04:00
Gennadiy Civil 3bb00b7ead Merge pull request #1929 from goatshriek/cmake-cxx11-flag 
add documentation of manual c++11 specification
 2018-10-23 22:32:15 -04:00
Gennadiy Civil 7b6b3be342 Update advanced.md 
Fixes #1802
 2018-10-23 17:27:38 -04:00
Gennadiy Civil a743780ad0 Update advanced.md 
Fixes #1755
 2018-10-23 11:16:46 -04:00
Gennadiy Civil b974af7923 Update advanced.md 
Fixes #1925
 2018-10-23 11:09:15 -04:00
Gennadiy Civil 90c957c408 Merge pull request #1927 from svg153/patch-1 
ACTION table format
 2018-10-23 10:51:30 -04:00
Gennadiy Civil c955e33497 Merge branch 'master' into python3-tests 2018-10-19 13:30:13 -07:00
Gennadiy Civil f410177a8b Update .travis.yml 
Revert attempted template depth fix , a real fix is coming
 2018-10-19 12:27:17 -07:00
Gennadiy Civil 723f26663f Update .travis.yml 
Testing increasing -ftemplate-depth to fix clang 3.9
 2018-10-18 14:27:39 -07:00
Gennadiy Civil 2c19680bf9 Merge branch 'master' into relocatable-pkgconfig-fix 2018-10-17 09:51:26 -07:00
Gennadiy Civil 754cb8ed96 Merge branch 'master' into relocatable-pkgconfig-fix 2018-10-12 12:44:33 -04:00
Gennadiy Civil f203b2db77 Merge pull request #1902 from theryee/typo 
Fix typo
 2018-10-11 13:15:47 -04:00
Gennadiy Civil 658c6390a5 Merge pull request #1898 from spartucus/master 
Update .gitignore
 2018-10-10 15:28:58 -04:00
Gennadiy Civil 7a1e9114a4 Update Makefile.am 
Remove references to gtest tupe
 2018-10-09 15:47:46 -04:00
Gennadiy Civil 689ac9fbd0 Update BUILD.bazel 
Remove references to googletest-tuple-test.cc
 2018-10-09 15:42:49 -04:00
Gennadiy Civil 5ae4f62225 Update README.md 
Closes #587
 2018-10-09 11:45:47 -04:00
Gennadiy Civil 272c08380a Delete CHANGES 
We are not maintaining change log, it has not been touched for a long time
 2018-10-09 11:16:06 -04:00
Gennadiy Civil ac7ed4046c Delete CHANGES 
We are not maintaining change log, it has not been touched for a very long time
 2018-10-09 11:15:26 -04:00
Gennadiy Civil 3149e0e88b Merge branch 'master' into python3-tests 2018-10-05 16:23:55 -04:00
Gennadiy Civil 40f82ce56a Update primer.md 
fixes #1709
 2018-10-05 16:23:08 -04:00
Gennadiy Civil 4b82df5bb3 Merge branch 'master' into python3-tests 2018-10-04 15:08:14 -04:00
Gennadiy Civil e93da23920 Merge 68b8a4c60c into 7796273056 
Closes #1880

PiperOrigin-RevId: 215429534
 2018-10-02 14:52:38 -04:00
Gennadiy Civil 2e91bbcf6f Merge pull request #1875 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-10-01 14:53:59 -04:00
Gennadiy Civil 6316d89433 Merge pull request #1872 from jerryturcios08/master 
Add C++11 standard in the root CMakeLists.txt
 2018-10-01 11:38:26 -04:00
Gennadiy Civil 440527a61e Update appveyor.yml 
Since we only one one MinGW left, lets enable it on PRs
 2018-09-26 21:52:12 -07:00
Gennadiy Civil 907ae9edad Merge branch 'master' into python3-tests 2018-09-25 22:09:27 -07:00
Gennadiy Civil 75e834700d Merge pull request #1864 from google/revert-1853-appveyor-mingw-enable-tests-again 
Revert "[mingw] enable the unittests for gmock and gtest again"
 2018-09-25 22:06:05 -07:00
Gennadiy Civil c2a2f49a3d Revert "[mingw] enable the unittests for gmock and gtest again" 2018-09-25 21:58:40 -07:00
Gennadiy Civil 707b3b25c8 Merge pull request #1855 from zach2good/issue1854_remove_i386_xcode10 
Issue #1854: remove support for i386 for XCode 10
 2018-09-25 21:44:35 -07:00
Gennadiy Civil a6b5c58ec8 Merge pull request #1853 from matlo607/appveyor-mingw-enable-tests-again 
[mingw] enable the unittests for gmock and gtest again
 2018-09-25 21:44:13 -07:00
Gennadiy Civil 9241466921 Merge branch 'master' into appveyor-mingw-enable-tests-again 2018-09-25 21:29:51 -07:00
Gennadiy Civil 0809c68040 Merge pull request #1862 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export (and revert #1850)
 2018-09-25 21:29:20 -07:00
Gennadiy Civil 220e790a96 Keep one MinGW build, remove the others 2018-09-25 20:57:46 -07:00
Gennadiy Civil 77301d64c8 Update appveyor.yml 2018-09-25 20:53:57 -07:00
Gennadiy Civil 8286bf2233 Update appveyor.yml 2018-09-25 20:49:16 -07:00
Gennadiy Civil 24ba1b1b3e Delete m4_ax_cxx_compile_stdcxx_11.m4 2018-09-25 20:32:54 -07:00
Gennadiy Civil 239d2691b4 Delete m4_ax_cxx_compile_stdcxx.m4 2018-09-25 20:32:37 -07:00
Gennadiy Civil 12b97f3783 Update configure.ac 2018-09-25 20:32:11 -07:00
Gennadiy Civil 993f6d8960 Update Makefile.am 2018-09-25 20:31:31 -07:00
Gennadiy Civil adcb1f8e8e Update .travis.yml 2018-09-25 20:23:25 -07:00
Gennadiy Civil df2a8dbc6d Update configure.ac 2018-09-25 16:35:47 -07:00
Gennadiy Civil 5a4e2b1580 Update configure.ac 2018-09-25 16:29:31 -07:00
Gennadiy Civil 70de02bf2c Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4 2018-09-25 11:08:43 -07:00
Gennadiy Civil 70ed5e5c45 Merge pull request #1863 from google/revert-1857-master 
Revert "Add clang format check to one of the builds"
 2018-09-25 11:08:29 -07:00
Gennadiy Civil c34ecf1ff0 Revert "Add clang format check to one of the builds" 2018-09-25 10:05:30 -07:00
Gennadiy Civil 0f7f5cd93a Merge pull request #1861 from gennadiycivil/master 
adding c++11 to appveyor mingW and autotools build
 2018-09-25 09:59:22 -07:00
Gennadiy Civil 5e13fe6622 Merge branch 'master' into appveyor-mingw-enable-tests-again 2018-09-25 00:12:18 -07:00
Gennadiy Civil a4f57cf49a Merge branch 'master' into python3-tests 2018-09-25 00:10:15 -07:00
Gennadiy Civil b19266a3e3 Merge pull request #1857 from gennadiycivil/master 
Add clang format check to one of the builds
 2018-09-25 00:09:27 -07:00
Gennadiy Civil ed6e84ccef Merge pull request #1850 from Jonny007-MKD/master 
Added special catch for std::exception in GTEST_TEST_NO_THROW_
 2018-09-23 12:25:08 -07:00
Gennadiy Civil fd17c91bad Merge branch 'master' into master 2018-09-23 12:10:40 -07:00
Gennadiy Civil c7a429a667 Update CONTRIBUTING.md 2018-09-23 12:10:08 -07:00
Gennadiy Civil 51945d3cd5 Update README.md 2018-09-23 12:07:25 -07:00
Gennadiy Civil a2f13308c8 Add .clang-format 2018-09-23 12:05:21 -07:00
Gennadiy Civil 81c0b876b4 Formatting 2018-09-23 09:42:11 -07:00
Gennadiy Civil 6596471104 Formatting 2018-09-23 09:41:12 -07:00
Gennadiy Civil 5293383707 Formatting 2018-09-23 09:35:25 -07:00
Gennadiy Civil 78d3bfeb44 Formatting 2018-09-23 09:34:47 -07:00
Gennadiy Civil 90943525c5 Merge branch 'master' into python3-tests 2018-09-20 14:30:26 -04:00
Gennadiy Civil 258def01a6 Merge pull request #1847 from google/revert-1832-master 
Revert "Added special catch for std::exception in GTEST_TEST_NO_THROW_"
 2018-09-20 14:29:02 -04:00
Gennadiy Civil a35326be04 Revert "Added special catch for std::exception in GTEST_TEST_NO_THROW_" 2018-09-20 14:12:48 -04:00
Gennadiy Civil 8bf297233f Merge pull request #1843 from matlo607/fix-unittest-msys-ColoredOutputTest 
[msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColors
 2018-09-20 11:42:29 -04:00
Gennadiy Civil 09560fba44 Merge pull request #1844 from matlo607/fix-msys-build-gmock-matchers_test 
[msys] pass big object file option to assembler for target gmock-matchers_test
 2018-09-20 11:42:02 -04:00
Gennadiy Civil 4f55245183 Merge pull request #1846 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-09-20 11:30:23 -04:00
Gennadiy Civil 9ea0172850 Merge pull request #1832 from Jonny007-MKD/master 
Added special catch for std::exception in GTEST_TEST_NO_THROW_
 2018-09-19 22:19:23 -04:00
Gennadiy Civil bc2d0935b7 Merge pull request #1838 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-09-14 15:54:01 -04:00
Gennadiy Civil fc2caf6485 Update .travis.yml 
Remove pre C++11
 2018-09-14 15:34:13 -04:00
Gennadiy Civil 28c2989eea Merge pull request #1837 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-09-14 11:43:05 -04:00
Gennadiy Civil 1b2da360ed Merge branch 'master' into master 2018-09-14 11:21:31 -04:00
Gennadiy Civil f46c174d1c Merge pull request #1835 from google/gennadiycivil-TR1-docs-cleanup 
Remove TR1 mentions
 2018-09-14 11:15:41 -04:00
Gennadiy Civil abc803e288 Update README.md 2018-09-13 17:23:21 -04:00
Gennadiy Civil 5c89346def Update README.md 2018-09-13 17:22:16 -04:00
Gennadiy Civil cfe0ae8678 Merge pull request #1831 from anthraxx/fix/version 
version: fix declared version to be in sync with CMakeLists.txt
 2018-09-13 10:35:19 -04:00
Gennadiy Civil 2649c22181 Merge pull request #1834 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-09-13 09:33:13 -04:00
Gennadiy Civil 5131cf737c Merge pull request #1828 from gdsotirov/patch-1 
Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env
 2018-09-12 14:45:36 -04:00
Gennadiy Civil ca247e1797 Merge branch 'master' into patch-1 2018-09-12 14:24:36 -04:00
Gennadiy Civil d25268a55f Merge pull request #1829 from google/gennadiycivil-patch-1 
Update appveyor.yml
 2018-09-12 11:42:08 -04:00
Gennadiy Civil 5eee7a343b Update appveyor.yml 2018-09-12 10:33:31 -04:00
Gennadiy Civil 4d066127be Merge pull request #1827 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-09-11 14:41:57 -04:00
Gennadiy Civil 0c799d0436 Merge pull request #1820 from Romain-Geissler/fix-gcc-misleading-indentation-warning-again 
Fix gcc misleading indentation again.
 2018-09-10 21:23:02 -04:00
Gennadiy Civil 34d5d22b64 Merge pull request #1814 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-09-06 08:48:52 -04:00
Gennadiy Civil 0614a539f0 Merge pull request #1809 from KindDragon/fix-doc-links 
Fix doc links
 2018-09-05 14:08:31 -04:00
Gennadiy Civil a2b149b239 Merge pull request #1801 from SoapGentoo/fix-gmock-pkgconfig 
pkgconfig: Unconditionally depend on GTest when using GMock
 2018-09-04 11:31:18 -04:00
Gennadiy Civil 990bf4ffd1 Merge branch 'master' into fix-gmock-pkgconfig 2018-09-04 10:59:31 -04:00
Gennadiy Civil 3787a483b9 Merge pull request #1803 from KindDragon/patch-2 
Update documentation to syntax highlight code
 2018-09-04 10:56:49 -04:00
Gennadiy Civil 25bf884321 Merge pull request #1806 from asiplas/master 
Fix #1805: add `.md` to hyperlink
 2018-09-04 10:55:52 -04:00
Gennadiy Civil c7a8998556 Update README.md 2018-08-31 11:56:04 -04:00
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