Squashed 'third_party/googletest/' changes from f570b27..2fe3bd9
2fe3bd9 Merge pull request #1433 from dsacre/fix-clang-warnings
d615eeb Merge branch 'master' into fix-clang-warnings
4005388 Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4
6dd60ec Update googletest-output-test-golden-lin.txt
13c5230 Add user-defined copy constructor to ValueArray
8f27912 Add missing declarations for Google Tests flags
bb18e25 Make g_argvs static
d41f53a Make dummy variables static to avoid compiler warnings
e41f38b Re-generate gtest-param-test.h from gtest-param-test.h.pump
76af254 Update googletest-output-test-golden-lin.txt
0ecf38f Update googletest-output-test-golden-lin.txt
a5cc7aa Googletest export
41b5399 Googletest export
00d1ffc Googletest export
2cc0085 Googletest export
b8e2562 Merge pull request #1790 from google/9A681768AABE08D1EFA5CA77528236A4
9ad7398 Update gmock-matchers.h
1db4a42 Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4
3dbba3b Changing clang tp 3.9 as 3.7 no longer works on Travis
fab2252 Changing clang tp 3.9 as 3.7 no longer works on Travis
f1e529a clang 3.7 -> 3.9
d7d21c0 clang 3.7->3.9
a83e98d Update .travis.yml
964748a Update .travis.yml
e8ebde4 Testing, trying to figure out clang errors
3d56121 Merge pull request #1794 from BlueMonday/patch-1
ca912f8 Fix broken FAQ link in primer.md
e103fa4 Disable MCVS warnings
9b2016a typo
e8e26d2 typo
8c0e0d5 MSVC warnings silence
9d9d7a6 Update googletest-output-test-golden-lin.txt
65d0353 Googletest export
03867b5 Googletest export
52f8183 Googletest export
167c5e8 Googletest export
1bb7618 Googletest export
58f3f10 Merge pull request #1784 from DavidSchuldenfrei/add-adapter-to-readme
b3d2106 New Readme.md
2e68926 Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemock
ebb2fca Merge branch 'master' into fix-1764_CMake-errors-in-googlemock
641e7a3 Update CONTRIBUTING.md
603ce4b Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7f42e8ae66ea365b5b8508fecb31509
a0e62d9 No longer require a functor passed to ResultOf matcher to define `result_of` type. This makes ResultOf more convenient to use. In particular, the matcher now accepts lambdas.
b19292e Use `$<INSTALL_PREFIX>` in `target_include_directories`
9c96f50 Merge pull request #1781 from wfvining/fix1764-cmake-errors
08aa7c6 Fix #1764 Remove cmake code that leads to a configuration error
c3d9db4 Update README.md
bf98ce2 Merge pull request #1767 from jschloss-swift/issue_1735
205df10 Merge branch 'master' into issue_1735
7f11b9f Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4
87494af Googletest export
9dae300 Googletest export
dc72f7c Googletest export
6de3982 Merge branch 'master' into issue_1735
6e79801 It seems like CMAKE_CXX_FLAGS is getting double appended when building as a nested cmake project, which breaks my build as gcc does not allow -specs=nosys.specs to be called multiple times.
1d9a191 Merge pull request #1338 from stefanosoffia/master
aff0379 Install CMake export files
880896c Merge pull request #1682 from dakotahawkins/improve-exported-targets
759ef7c Improve CMake exported targets.
b88511e Merge pull request #1194 from joshbodily/josh/fix_scoped_class2
a6e7ba2 Merge branch 'master' into josh/fix_scoped_class2
735bd75 Update CONTRIBUTING.md
ecd844d Merge pull request #1759 from gennadiycivil/master
6c8c74e merge
df428ec googletest export
5891bb5 googletest export
cfc0d5f Testing, adding a few line to sample4
72a8105 Testing, adding to sample4 unittest
9404c5a Merge pull request #1754 from vkotovv/docs-advanced-broken-links
49e6a9b Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116
c1230de Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
ddc618a docs: fix more broken links to sections in Advanced guide
02c4f1a docs: fixed broken references to sections in Advanced guide
1778f20 Merge pull request #1347 from Burgch/fix-argc
97274b1 Merge branch 'master' into fix-argc
a946f7d Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
d1c1aac Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning
85b5723 Merge pull request #1652 from medithe/patch-1
cb69e68 Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
9d77e63 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2a380bc Merge branch 'master' into patch-1
e82d320 Merge pull request #1748 from laixer/std
0796415 std references shouldn't be fully qualified
cda442d Formatting
edc1bc6 Merge branch 'master' into patch-1
88cd665 Minor formatting/style changes
687964c Merge branch 'master' into fix-argc
a9bd428 Merge branch 'master' into fix-msvc-d9025-warning
02a8ca8 Merge pull request #1546 from henryiii/cleanup-cmake
a65a993 Merge branch 'master' into cleanup-cmake
f87798a Merge pull request #1646 from tisi1988/master
d20fa18 was not quite right,
b1bfdf0 Small formatting change
8c86040 Merge branch 'master' into master
8b34930 Merge pull request #1142 from scottslacksmith/master
c38f4b9 Small style changes.
21e5185 Merge branch 'master' into josh/fix_scoped_class2
f3a9fa6 Merge branch 'master' into master
1dad4cf Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
490554a Merge pull request #1746 from google/B60C9E9743233AA81897617B277709DF
ca87cc7 googletest export
1246e58 Merge branch 'master' into cleanup-cmake
2172c08 Merge pull request #1697 from morris-stock/ignore-cmake-generated-files
3c4f437 Merge branch 'master' into master
06b9759 Merge branch 'master' into ignore-cmake-generated-files
7e7e3a6 Merge branch 'master' into patch-1
997d343 Merge pull request #1734 from eliasdaler/cmake-binary-dir-fix
02671ab Merge branch 'master' into cmake-binary-dir-fix
587ceae Merge pull request #1741 from gennadiycivil/master
f0e4c41 more comments changes
e267717 Merge branch 'master' into cmake-binary-dir-fix
bbf738a more comments changes
265efde Comments changes, no functionality changes.
3306848 Merge pull request #1740 from gennadiycivil/master
a3c0dd0 Comments changes, no functionality changes
41fec55 Merge pull request #1665 from rongjiecomputer/deprecate
2421eff Merge branch 'master' into deprecate
17714d6 Merge pull request #1738 from gennadiycivil/master
f225735 Code formatting changes, clean up, no functionality changes
15ef6ec Merge pull request #1733 from gennadiycivil/master
caeaef3 Merge branch 'master' into master
87a37c6 Merge branch 'master' into master
c203bee formatting custom/README.md
9060e19 formatting for new READMEs
8bc11c0 Merge pull request #924 from wind-river-cdt/cross-testing-patch-1
9ca399a Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717)
47b57ff Merge branch 'master' into cross-testing-patch-1
44fb2a1 Merge branch 'master' of https://github.com/google/googletest
63baab8 Move instructions into custom/README files
7800ba3 Merge pull request #1732 from gennadiycivil/master
18c940d comment cleanup
65b42fa Merge pull request #1731 from 2power10/master
ecc2419 - Fix the broken markdown table - Fix some format issue
ae94a90 Merge pull request #1727 from gennadiycivil/master
390a6b7 Mode change on a python script
8cccb2a Update README.md
9cb3819 Merge pull request #1726 from google/gennadiycivil-patch-2
b123652 Update README.md
77ac31c Update README.md
4de527d Update README.md
945618b Update README.md
e821a2d Update README.md
6b6be94 Merge pull request #1725 from google/gennadiycivil-patch-1
5eb2635 Update gmock_output_test.py
b46b86e Merge pull request #1719 from happyCoder92/master
6b89cb0 Merge pull request #1724 from gennadiycivil/master
4e13415 Merge branch 'master' into master
640556f Merge branch 'master' of https://github.com/google/googletest
acaf5be formatting and small changes related to code management, no functionality changes
4843eaf Merge pull request #1723 from gennadiycivil/master
71c2bb4 Merge branch 'master' into master
4d94114 code management comments, [ci-skip], no functionality changes
33596cb Merge pull request #1721 from gennadiycivil/master
7a79459 Fixing identation, causes build errors when warnings are treated as errors
54cb8b0 Merge branch 'master' of github.com:gennadiycivil/googletest
f704293 Fixing identation, causes build errors when warnings are treated as errors
d5b31df Update gtest-death-test.cc
9faeade Merge branch 'master' of https://github.com/google/googletest
ecc6944 Fixing identation, causes build errors when warnings are treated as errors
2797ba8 Merge pull request #1720 from gennadiycivil/master
3d167fd Merge branch 'master' of github.com:gennadiycivil/googletest
063a90b Formatting change for auto code management, no functionality changes
24786cb Merge branch 'master' into deprecate
db43df6 docs: fix broken links
efe27ac Merge branch 'master' into master
4de57ce Merge pull request #1714 from gennadiycivil/master
541eeb4 Merge branch 'master' into master
11f5a27 Merge branch 'master' into cross-testing-patch-1
00fc0d2 Formatting tweaks, no functionality changes
66bd580 Merge pull request #1713 from gennadiycivil/master
0eeb1af code management changes, no functionalty changes
61799bd Merge pull request #1710 from gennadiycivil/master
d31266e Merge branch 'master' of github.com:gennadiycivil/googletest
35e1959 Formatting Changes and small code merge
d5d335b Merge branch 'master' of https://github.com/google/googletest
bdf5fd3 Merge branch 'master' of https://github.com/google/googletest
d526632 Merge pull request #1708 from drwez/fixFuchsia
07d4543 Fix typo breaking Fuchsia build
b95a702 Merge pull request #1707 from gennadiycivil/master
094d7d2 Merge branch 'master' of https://github.com/google/googletest
41e82ca upsream additional printer test
8506852 Merge pull request #1705 from gennadiycivil/master
b345bf9 Formatting changes,small cleanup, no functionality changes
dd06b16 Merge pull request #1699 from drwez/suppressDefault
252dc32 Merge branch 'master' into suppressDefault
6f168c1 Merge pull request #1704 from gennadiycivil/master
b78c3b8 small cleanup, np functional changes
e9b05a4 Merge branch 'master' into master
886a747 Merge branch 'master' into suppressDefault
28b71e4 Merge pull request #1700 from gennadiycivil/master
24edf4e automatic code sync mgt, comment only
c81a349 Merge pull request #1673 from ppaulweber/bug/gcc_8_1_1_build_error
5d2e503 No default exception handling
61f9493 Merge branch 'master' into deprecate
1da26a7 Printers test: fixed compilation bug, due to unnecessary parentheses in declaration
51b6505 Ignore cmake generated files when used as submodule
e887b03 Merge pull request #1696 from gennadiycivil/master
2a7077f one more fix
b929d55 cmake fixes
0d29f97 more fixes
95c313e add --no_stacktrace_support for json-output-unittest
94f2c6f fixes tests
677df88 cmake test fixes
b7244ff cmake fixes
930f0f8 cmake tests changes
f3511bf cleaning up and adding test changes to CMake
1cd979a Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
bbc0ac9 Merge branch 'master' of https://github.com/google/googletest
5b9b39f Corresponding CMake Changes
8dea630 various changes to tests
421f527 more test changes
7001dff adding googletest-json-output unitest
09fc73d more test changes
96077bc more tests changes
b888e23 googletest list tests unitest
35aa4fe gtest catch exceptions test and gtest shuffle test
a28968d changes to googletest break on failure and googletest filter unittests
e5e2ef7 Merge pull request #1695 from gennadiycivil/master
d75922c changes for googletest env var test
38486eb googltest-color-test changes
6324796 googletest-output-test changes
16c65a4 Merge branch 'master' into master
572b07f Merge pull request #1685 from einsteinsfool/master
e69a1a8 Merge branch 'master' of https://github.com/google/googletest
539ee4b Formatting changes and upstreaming one test
25e1436 Merge branch 'master' into master
6269264 Merge branch 'master' into deprecate
f978c65 Merge branch 'master' into master
4f160f7 Merge pull request #1691 from gennadiycivil/master
012528c Merge branch 'master' of https://github.com/google/googletest
b7cb1bc small tweaks, OSS merge cl 206357486
0048647 Merge pull request #1688 from gennadiycivil/master
ec13264 added missing comments
984cba3 Formatting changes for automatic code management
6cacb41 Merge branch 'master' into deprecate
309e8a2 Updated broken and outdated URLs
40904f8 Merge pull request #1684 from gennadiycivil/master
ed1edf6 Formatting changes, code sync
78b4924 Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp
a68f0c2 Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
82c858b Merge pull request #1678 from stianval/master
1ae4fdb Merge branch 'master' into master
bb9fc6f Update primer.md
7abf99d Update primer.md
baf2115 Update primer.md
534570b Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
fd4f7cc Merge branch 'master' into deprecate
2a151c9 Merge pull request #1676 from gennadiycivil/master
a02af2f code merge
c62c794 Merge pull request #1668 from duxiuxing/googletest_for_asam
d8db0ca Merge branch 'master' into googletest_for_asam
2eb4396 Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio
6ce9b98 Merge pull request #1674 from gennadiycivil/master
61b8197 Merge branch 'master' into master
0c17888 code sync
1f9c668 Merge branch 'master' into deprecate
5b19054 Merge branch 'master' into googletest_for_asam
40cd5d1 Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
1370e76 Merge pull request #1669 from syohex/ignore-ds-store
a3509a5 Merge branch 'master' of https://github.com/google/googletest
43163c1 Merge branch 'master' into ignore-ds-store
4235fff Merge pull request #1671 from gennadiycivil/master
3530ab9 Code sync
d41bfd7 Fix link
8d07cfd Code sync, mostly formatting and removing outdates
7e73a7a Formatting and a link
20ef794 Merge pull request #1667 from hckr/patch-1
2211061 Merge pull request #1670 from gennadiycivil/master
234958d Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
4abbb77 Merge branch 'master' of https://github.com/google/googletest
5437926 Docs sync
a091b75 Ignore .DS_Store file
65a49a7 Fix warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss
021c308 Fix broken links to FAQ in primer.md
378de8f Merge branch 'master' into deprecate
077ee54 Merge pull request #1655 from AdrianMoranMontes/master
3a8d744 Disable MSVC function deprecation when using Clang
ee3885f Merge branch 'master' into master
cbd0719 Put ifdef guard after the includes.
b4d4438 Merge pull request #1653 from derekmauro/stacktrace
82670da Merge branch 'master' into stacktrace
df0d0a3 Merge pull request #1662 from derekmauro/variant
6c7878a Adds the UniversalPrinter for absl::variant.
0acdf79 Avoid full test in no exceptions are enabled.
de6e079 Merge branch 'master' into master
421e7b4 Remove default /EHsc compiler flag
a519050 Merge branch 'master' into master
41f0e24 Merge pull request #1647 from duxiuxing/googletest_for_asam
d91b0de Merge branch 'master' into googletest_for_asam
7eae4ea Merge pull request #1656 from gennadiycivil/master
36066cf more formatting [skip ci]
74cccf4 formatting, [ci skip]
93bfdde Fix issue #1654.
4f91942 Fix heading
50daf29 Docs sync
d772e20 Pass the --no_stacktrace_support argument to the CMake tests
4c41787 Adds stacktrace support from Abseil to Google Test
b50b2f7 Cast the tr1::tuple_element template parameter to int
4bcc9b9 This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.
03ea2fd VS2005 with SP1(_MSC_VER=1400) already supports __pragma
dfddc98 FIX: Compilation warning with GCC regarding a non-initialised member from MutexBase class.
ba96d0b Merge pull request #1622 from rohanjoyce/bazel_test_filter
0563b52 Eliminate GTEST_TEST_FILTER_ENV_VAR_.
dea7929 Merge pull request #1633 from gennadiycivil/master
61d162b Merge branch 'master' into master
ce468a1 Merge pull request #1627 from atetubou/stdstring
a0d43a7 Merge branch 'master' into stdstring
c7ec593 ignore .md for appveyor builds
885808c Merge pull request #1631 from gennadiycivil/master
3847aec Docs sync/internal
d689b27 Merge branch 'master' of https://github.com/google/googletest
6a484ba Doc sync/internal
c83e83e Merge branch 'master' into stdstring
30ff9c3 Merge pull request #1626 from gennadiycivil/master
f4d0631 Reduce the number of strcmp calling while initialization
025f48f Sync with internal docs
1bccd6f Merge pull request #1625 from gennadiycivil/master
336a75d Merge branch 'master' of https://github.com/google/googletest
95a96e1 Sync with internal docs
9077ec7 Merge pull request #1624 from gennadiycivil/master
0b958a0 Removed "Documentation.md" not adding value and not consitent with internal docs
109f848 Rename Samples.md to samples.md and adjust the links
4490be8 Rename FAQ.md to faq.md and adjust the links.
f213b63 Merge branch 'master' of https://github.com/google/googletest
8f87d00 Rename AdvancedGuide.md to advanced.md and adjust the links. Part of documentation rationalization work
c091b04 Merge pull request #1623 from Steelskin/fuchsia-fdio
de47b0d Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion rationalzation
d437209 Fuchsia: Change fdio include path.
98a0d00 Merge pull request #1619 from Steelskin/fuchsia-launchpad-removal
2d136e5 Merge branch 'master' into fuchsia-launchpad-removal
7e7f9d5 Merge pull request #1620 from gennadiycivil/master
7b08984 Merge branch 'master' into fuchsia-launchpad-removal
f66ab00 Upstream, cl/199129756
db5f9ec Merge pull request #1608 from gennadiycivil/master
93e267a Clean up
0a6edf3 Remvoe launchpad dependency from Fuchsia.
8977af0 formatting changes
4e4df22 Merge pull request #1607 from gennadiycivil/master
28c91e2 Formatting changes
145d057 Merge pull request #1603 from Steelskin/unused-variable-fuchsia
32c84be Merge branch 'master' into unused-variable-fuchsia
8276dba Merge pull request #1591 from sgraham/disabled-rtti
3b22e21 Merge branch 'master' into disabled-rtti
1814bed Merge pull request #1601 from jdennett/StdLibVersioning
49ecebd Downgrade to C++98.
ec2c911 Downgrade to C++98 code.
89286a4 Merge branch 'master' into StdLibVersioning
3280099 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
f91bf75 Remove unused variable in Fuchsia.
9db942a Merge branch 'master' into disabled-rtti
08d5b1f Merge pull request #1597 from jaeheonlee/master
54e331b Add support for versioned standard libraries.
fc66ae4 Update generated code.
b8fa4d2 Add unit test for CanonicalizeForStdLibVersioning.
18abd8f Use NULL instead of nullptr, for pre-C++11 builds.
ec5ad0f Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively.
045e7f9 Merge pull request #1593 from Steelskin/fuchsia_death_test
10f05a6 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
960149f Remove magic number
242f0f6 Style fix
8497540 Fix comments
13af91f Fix more stuff and get tests to pass
96c3c42 Get all the things to work.
a9653c4 Fix gmock not building when -fno-rtti
b6cb5c3 Fix stuff
d4b5281 Add Fuchsia support for death test.
278aba3 Merge pull request #1589 from sgraham/rtti-build
95ec42d Add no-exception and no-rtti to build matrix
dc043e1 Merge pull request #1588 from gennadiycivil/master
9af3793 merged
b539167 merging,
a6f06bf Merge pull request #1582 from dnsunderland/parameterless
884bcda Merge branch 'master' into parameterless
1114a02 Merge pull request #1580 from gennadiycivil/master
bb7a018 reverting, test
7b4ee66 reverting just to test
62a7c14 testing
2d3024f Fix friend declaration to use GTEST_API_ decl spec.
b2f97ab Revert useless use of GTEST_API_ on WithoutMatchers decl.
1c79ad7 Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC?
d5725da Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors.
7878b27 Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into parameterless
f6551f2 Don't use generalized initializer list; is C++11 extension.
08cb06b Merge branch 'master' into parameterless
f437f8c Clone of unsubmitted cr/176529515. Introduce parameterless expectations.
f312435 more typos
a0fd742 msvc
b00e281 more typos
881ee30 typo
10e8ec2 move only types docs
4d554c3 typo
b4cbf53 typo
78d7381 http://cl/193386206
a48b95e Merge branch 'master' of github.com:google/googletest
c56ba73 merge, explicit, ( should be it)
4bd8c46 Merge pull request #1579 from gennadiycivil/master
8831178 Merge branch 'master' of github.com:google/googletest
4707c0f 193353312
4035d6e Merge pull request #1577 from gennadiycivil/master
80d6e26 cl/193060888
5dccf6b http://cl/193060888
dff32af http://cl/193060888
3f88bb1 test-meerging
ec425d7 typo
e4ab316 more msvc
1944bc0 typo
e9eff48 msvc warnings
bd2a1ae merging gmock generated matchers
1f60541 Merge pull request #1576 from gennadiycivil/master
9fba103 merging, testing, this should be it
1c6e68c merging
26c10dc merging
247ded3 Merge pull request #1571 from gennadiycivil/master
d84eb86 more pizza
f45728a more OSX pizzas
b74a1af osx pizzas
f9bd618 merging gmock actions test
0bfa823 merging, gmock actions test
38de61d Merge pull request #1569 from gennadiycivil/master
6d31084 Merge branch 'master' of https://github.com/google/googletest
2dc576e merging
0957cce Merge pull request #1568 from gennadiycivil/master
f7330f9 more fixing osx libstd++ bugs
6538049 fixing
dc4f563 merging, fix OSX issue
092ca91 merging
6fb65b8 Merge pull request #1567 from gennadiycivil/master
a79851f merging
3ccd6e3 Merge pull request #1566 from gennadiycivil/master
fa658e0 merging
531e294 Merge pull request #1562 from gennadiycivil/master
c67f51b msvc
9b5940e revert this one
b2d81b4 merge, ... gmock-matchers test
07f3bdd Merge branch 'master' of https://github.com/google/googletest
b640d87 Merge pull request #1557 from pwnall/gmock-fix-ub
854adb0 Merge branch 'master' of https://github.com/google/googletest
e77deb2 small cleanup
1324e2d Remove multiple inheritance from "unintesting call" mock classes.
fdb57f8 Merge pull request #1561 from gennadiycivil/master
373481c ...merging
ef17a9f Merge branch 'master' of https://github.com/google/googletest
6273647 Merge pull request #1560 from gennadiycivil/master
8654c1c merging
af4cfd5 Merge branch 'master' of https://github.com/google/googletest
ab84d14 Upstream cl/192179348
b4429c9 Merge pull request #1559 from gennadiycivil/master
106e731 Merge branch 'master' of https://github.com/google/googletest
c13ab60 merging
d5988e7 Merge pull request #1558 from gennadiycivil/master
5cd213e ..and this should be it
6a7573a more
039d9b5 pizza work, cont
f15fd96 osx pizzas, cont
b15be9a fixing osx pizza
6f9db26 merging
9bc82ce merging
25d8176 merging
39c58da merge
e1071eb RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
8fbb419 Include gcc on mac into PR matrix
a072611 Merge pull request #1556 from google/revert-1551-master
ca54b67 Revert "gmock actions 2"
7f03f7c Merge pull request #1551 from gennadiycivil/master
64d24b8 ... and this
c1d4c34 this should be it
f587100 yet more
05b5a53 formatting
2de24fb tuning
055f321 tuning
57d6e82 more
44da2b9 cont
e93a0ec msvc
c4684b4 more msvc
431bfdc msvc 14
8bc7c63 testing msvc again
c4e3d77 More msvc 14
6525044 And also silence for MSVS14
35a709a preproc syntax ( I can never remember it)
61e8a0b syntax
03be5df cont.
e0b3c26 continued
d0de118 Merge branch 'master' of github.com:google/googletest
7529698 Merge pull request #1552 from pwnall/mock-pump
51f8ad4 Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.
dbd206e more mcvs fixing
701e1e5 linkage, fixing MSVC
2d4d4ef fixing MSVC
4b6a7a4 Merge branch 'master' into cleanup-cmake
5fe8de5 more warnings
cb13dc7 more warnings
d9f3611 more MSVC warnings
c75b76e warnings
04e3188 cont - 2
32ac949 cont
1831ac9 more warnings
eb3e4aa deal with MSVC warn, cont 1
50c0bcd Cont. deal with MCVS warnings
b5c87fb Deal with MCVS warnings
427b6a2 Merge branch 'master' of github.com:google/googletest
88fc7d7 merging gmock-actions 2
82febb8 Merge pull request #1549 from gennadiycivil/master
bee1d13 Merge branch 'master' of github.com:google/googletest
fe402c2 Merging gMock, 2
d090565 Merge pull request #1547 from gennadiycivil/master
7e5f90d formatting
9286361 And more MCVS warnings
e0f4cf0 fixing MCVS warn
7045138 Have to wait for this one
66eaf9f Have to wait for this one
af93d59 Merging matchers test
47d15bc Merge branch 'master' of github.com:google/googletest
0cd6a4f Merging matchers test
b22e8de Clean up cache non-advanced variable for subproject
2cf2a1f Merge pull request #1545 from gennadiycivil/master
f7098a2 Merge branch 'master' into master
d81b6a0 bad cut/paste
a608d4a More on MSVC warning C4503, decorated name length exceeded
6f4e939 More on MSVC warning C4503, decorated name length exceeded
5b3d277 Address MSVC warning C4503, decorated name length exceeded, name was truncated
aa14cc4 Fixing build break on MSVC
891e436 Merge pull request #1543 from fo40225/fix_locale_win
0f790fa Merge branch 'master' of github.com:google/googletest
e55089e merging gmock matchers 1
fbe3c94 Merge branch 'master' into fix_locale_win
4377699 Merge pull request #1542 from gennadiycivil/master
a0c27bd fix build break on locale windows
1776ed8 Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
07af8af Merge pull request #1523 from leissa/int3
98687b7 Merge branch 'master' into int3
7d95543 Merge pull request #1541 from gennadiycivil/master
18be012 Merge branch 'master' into int3
75ea13d Merge branch 'master' of github.com:google/googletest
d52aaee Upstreaming, cl 191344765
ac783bd Merge pull request #1539 from gennadiycivil/master
2750742 Merge branch 'master' into int3
a2dd136 merging port, cont. 191443078
1065591 Merge branch 'master' of github.com:google/googletest
aa349ac merging, cont - 2
6c9d07f Merge pull request #1538 from gennadiycivil/master
6abaa24 Merge branch 'master' of github.com:google/googletest
2cedd5b merging gtest-port.h , 191439094
653a435 Merge pull request #1537 from gennadiycivil/master
04d1e56 merging, just comments format
5beb452 testing, merge
b8cbd53 Merge branch 'master' of github.com:google/googletest
df5a48d Testing, gtest-port.h merge
9df719d Merge pull request #1534 from gennadiycivil/master
87a4cdd merging gtest-port.h, again - 1
5c7c365 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
b1d18b8 Merge branch 'master' into int3
7888184 Include OSX builds back into PR builds
86d1407 Merge pull request #1527 from google/revert-1518-master
b2373c6 Revert "merging gtest-port 1 of N"
527fd38 Merge pull request #1526 from google/revert-1525-master
54bb165 Revert "merging gtest-port, 2"
e10ea42 Merge remote-tracking branch 'google/master' into int3
d04bf07 typo
09a0e17 Merge pull request #1525 from gennadiycivil/master
8e0364a merging gtest-port, 2
11855d8 provide alternative for DebugBreak()
9dde7c4 Merge pull request #1518 from gennadiycivil/master
aea6fc3 merging gtest-port 1 of N
cafa9e5 Merge pull request #1515 from gennadiycivil/master
a75a5c9 merges 1
a0e2faf Merge branch 'master' of https://github.com/google/googletest
3df7cbe merges, gtest
7857975 Merge pull request #1512 from gennadiycivil/master
6aae206 merging gmock-matchers.h 3
2318705 merging gmock-matchers.h 2
8ea10d3 Upstreaming FloatingEq2Matcher,
b907c26 Merging gmock-matchers.h -2
466a49a gmock-matchers merging -2
a28a7eb Merge branch 'master' of https://github.com/google/googletest
dfa853b Merge pull request #1510 from gennadiycivil/master
b7c5683 merging, gmock -1
a1692ed Merge branch 'master' into master
4e89c76 reverting gtest_list_tests_unittest.py
eaaa422 Update appveyor.yml
da71e8c more merges
0f65679 more merges
691e38e More merges
dccc2d6 Merge pull request #1508 from gennadiycivil/master
a3c2e10 cl 189032107, again
080fcbe cl 189032107
a178cc7 merge, again, IsRecursiveContainer
a325ad2 Merge pull request #1504 from gennadiycivil/master
262aaf2 erging, cont
2814b4b merging, merging
a719320 fixing, was removing too much
5461f63 Merge branch 'master' of https://github.com/google/googletest
af463c4 More merges, removing old dead code
f35fe6d Merge pull request #1503 from sheepmaster/upstream_188748737
fc437ef Merge branch 'master' into upstream_188748737
7b70413 Allow macros inside of parametrized test names.
abc6e94 Merge pull request #1502 from gennadiycivil/master
cf9d634 merges-port(1)
9bda90b Merge pull request #1497 from gennadiycivil/master
e891900 Merging, XML tests
703b4a8 Merge pull request #1493 from gennadiycivil/master
89d6f70 merges-8
617e2c5 Merge pull request #1492 from gennadiycivil/master
995a9df merges-7
ae4480f Merge pull request #1491 from gennadiycivil/master
086825d merges-6
731dbc4 Merge pull request #1490 from gennadiycivil/master
94d78ea Merge branch 'master' of https://github.com/google/googletest
8385928 merges-3
c3a007f Merge pull request #1489 from gennadiycivil/master
73bf412 Merge branch 'master' of https://github.com/google/googletest
dbf63e3 merges-2
a7ffeca Merge pull request #1488 from gennadiycivil/master
a518bd5 Merge branch 'master' of https://github.com/google/googletest
0d5e01a Merges-1
915c8d0 Merge pull request #1477 from sgraham/unsigned-wchar
829a8c9 Merge branch 'master' into unsigned-wchar
6d08931 Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
a7a7f51 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
6c73adf Merge pull request #1486 from petrhosek/json-stacktrace
7a2050d Use a full message in the JSON output for failures
f8fbe1c Merge branch 'master' into unsigned-wchar
447d58b Merge pull request #1485 from coryan/parallelize-appveyor
18d270e Merge pull request #1479 from petrhosek/json
3817871 Merge branch 'master' into json
3431b69 Add options to parallelize builds.
9557d29 Merge pull request #1481 from dneto0/debug-postfix
66d7175 Merge branch 'master' into debug-postfix
6baf17e Support JSON output format in addition to XML
fe11442 Merge pull request #1482 from zhangxy988/variant_matcher
e162233 Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher
576d689 Merge branch 'master' into variant_matcher
62be6f3 Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher
2eb31c1 Add documentation for VariantWith.
a9f2368 Merge pull request #1483 from gennadiycivil/master
ba40fd1 Merge branch 'master' into master
ce61dc5 Merge pull request #1423 from pcc/win-libcxx2
2bd1750 gmock merging -2
837c246 Merge branch 'master' into unsigned-wchar
ab46d95 Merge branch 'master' into debug-postfix
b951c65 Merge branch 'master' into variant_matcher
7d15497 Merge pull request #1464 from pwnall/death-style
190e2cd Add matcher for std::variant.
84ec2e0 Switch default death test style back to "fast".
d4f77c1 Merge branch 'master' into win-libcxx2
20074be Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX
5e1bca7 Merge branch 'master' into unsigned-wchar
ac34e6c Merge pull request #1472 from AndersSundmanTobii/master
aa31660 Merge branch 'master' into master
1d324d8 Merge pull request #1475 from gennadiycivil/master
4dbb437 merging unittests - 5
567b40e Try to handle unsigned wchar_t (arm) a bit better
004f6a0 merging unitests - check 4
194c99b Merge branch 'master' of https://github.com/google/googletest
3a4cf1a Merge pull request #1474 from gennadiycivil/master
29e9ca8 merging unitests, check
3299a23 merging unittests - 2
c056345 Merge pull request #1473 from gennadiycivil/master
b7e0294 merging unitests
70e1aad Merge pull request #1471 from aleksejkozin/patch-1
11e1dd2 Removed trailing comma in enum
99bb4fe Merge branch 'master' into patch-1
a490fb7 Merge pull request #1466 from pwnall/fix-death-warn
0656830 TEST() arguments are invalid in an example
ac138b6 Merge branch 'master' into fix-death-warn
32e62da Merge pull request #1469 from gennadiycivil/master
df65632 merges
8a61587 Fix unused function warning on Mac OS.
3f0cf6b Merge pull request #1450 from pwnall/fix-printers
8dd1eb5 Merge branch 'master' into fix-printers
4214050 Merge pull request #1459 from gennadiycivil/master
8248169 Merge branch 'master' of https://github.com/google/googletest
a3e322b cleanup, merges
0d6a674 Merge pull request #1458 from gennadiycivil/master
823f139 Merge branch 'master' into fix-printers
68e4f07 Merge branch 'master' of https://github.com/google/googletest
09581b3 cleanup/merges
38611c5 Merge pull request #1457 from gennadiycivil/master
0697241 merging, cleaning up
462ef92 Merge pull request #1456 from gennadiycivil/master
6429075 Merge branch 'master' of https://github.com/google/googletest
ab186a8 merges
ffc5f5a Merge pull request #1454 from gennadiycivil/master
30d276d cxxx11
3b1fe3e clang warnings
d7c966c clang warnings
2a23ca0 https://travis-ci.org/google/googletest/jobs/340995238
a66d209 clang warning 'https://travis-ci.org/google/googletest/jobs/340987201'
e76f4ee clang warning https://travis-ci.org/google/googletest/jobs/340978022
9e07281 merges
9d1a80c Merge pull request #1452 from gennadiycivil/master
1a7732a Merge branch 'master' of https://github.com/google/googletest
225e674 moving JoinAsTuple to internal
b3a1759 Fix std::iscntrl use in gtest-printers.cc
222607a Merge pull request #1451 from gennadiycivil/master
b94ba27 Merge branch 'master' of https://github.com/google/googletest
d84f58a Merging, coniniue
f11a8f9 Merge branch 'master' into fix-argc
15392f1 Merge pull request #1449 from gennadiycivil/master
575c081 merging
49fc378 merges
9737e63 Merge pull request #1439 from DarthGandalf/assert
b324a36 Merge branch 'master' into assert
22a1150 Merge pull request #1446 from tholsapp/master
c211f21 Merge pull request #1448 from gennadiycivil/master
ec7faa9 merges
c851050 Fixed typos
092d088 Add ability to throw from ASSERT
a3c73ed Include MSVC14 on PRs as well
ea31cb1 Merge pull request #1435 from gennadiycivil/master
e6ec8bc Merges and also adding new bazel build mode
e55fded Code merges
a1923a5 Merge pull request #1434 from gennadiycivil/master
2a46830 Ability to optionally depend on Abseil plus upstream of 183716547
798cc4a Merge pull request #1430 from gennadiycivil/master
6c0c389 Adding tests to googlemock bazel
718fd88 Merge pull request #1429 from gennadiycivil/master
92c9380 Merge branch 'master' of https://github.com/google/googletest
fbb48a7 Code merges
cb72716 Merge pull request #1428 from lidaobing/patch-2
aa82c6f Merge pull request #1426 from stefanosoffia/fix_test_build_gcc7_2_0
efd49c2 Update Documentation.md
b8ac390 Fix test build issue with GCC7.2.
3498a1a Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
f915530 Pass -EHs-c- to disable exceptions with MSVC.
b3a2048 Update README.md
7cced89 Remove Visual Studio 10,11,12 from build matrix
46ab9ec Merge pull request #1421 from gennadiycivil/master
b9651c0 placating gcc and its overzeauls size comparison warnings
264ba3e Merge branch 'master' of https://github.com/google/googletest
21cf836 Merge pull request #1418 from gennadiycivil/master
e29805a upstream cl 182543808
7a2563a Merge branch 'master' of https://github.com/google/googletest
06c3cce revert, lets get this compiled
ab9c44c Merge pull request #1410 from pcc/win-libcxx
80defce Many code merge/upstream changes
ad0146b Merge branch 'master' into win-libcxx
3c5e064 Merge pull request #1417 from gennadiycivil/master
58df576 Merge branch 'master' of https://github.com/google/googletest
6723b6c Merging, upstream http://cl/182836545
bbb17ad more code merge
f1c87ad merges, cl/155419551 and other
83fa0cb Merge pull request #1415 from gennadiycivil/master
9bc8666 more merging
a0435a5 merging
8d707df code merge
62ba5d9 Merge pull request #1401 from eidosmontreal/support_xboxone
1489dc8 Merge branch 'master' into support_xboxone
20b53ad Merge branch 'master' into win-libcxx
0510530 Merge pull request #1412 from gennadiycivil/master
b1623e9 Adding python tests to Bazel build file.
8d733dc Merge pull request #1407 from ted-xp/master
8e86221 Use fully qualified in examples
354fc8d Document ScopedTrace utility
ba99a04 Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++.
9c82e77 Expose ScopedTrace utility in public interface
1b07766 Merge pull request #1402 from gennadiycivil/master
08b323f Reverting some changes, need to make the merge compile
9195571 Reverting some changes, need to make the merge compile
6d04de7 Reverting some changes, need to make the merge compile
b9e2978 Reverting some changes, need to make the merge compile
304be8f Test files for corresponding changes
6befe42 Test files for corresponding changes
f45c22c Test files for corresponding changes
5f4ce9d Test files for corresponding changes
26085d7 Merge branch 'master' of github.com:gennadiycivil/googletest
d629744 More code merges
6c86598 Merge branch 'master' of https://github.com/google/googletest
822c620 Merge branch 'master' into master
da1f7fe Code merging
051fe2f Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared
f6887b5 Merge branch 'master' into fix-core-dump-shared
63ded6c Merge pull request #1400 from gennadiycivil/master
27bb844 Merge branch 'master' into fix-argc
ea8f6f0 Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone
33d73d4 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
7ebbf59 Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone
569d713 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
93b7798 continue upstream/merge, etc
717d784 Merge branch 'master' of https://github.com/google/googletest
ed8d02c Update .travis.yml
73d1251 Update .travis.yml
cfd29e0 Update .travis.yml
29f94e0 Update .travis.yml
2982dc1 Trying to fix travis
1321891 Merge pull request #1399 from gennadiycivil/master
5add347 Merge branch 'master' of https://github.com/google/googletest
6914ae2 Upstream cl 103120214
836c419 Merge pull request #1398 from gennadiycivil/master
1d757db More merge, cleanup
b44ed21 Merge branch 'master' of https://github.com/google/googletest
481fe94 More merge, cleanup
cac5d7c Merge pull request #1397 from gennadiycivil/master
84aa459 Merge branch 'master' of https://github.com/google/googletest
6a26e47 Code merge, upstreaming accumulated changes, cleanup
d719689 Merge pull request #1396 from gennadiycivil/master
62dbaa2 revert
d630a8b code merges, cleanup
6efe104 Merge pull request #1395 from gennadiycivil/master
f33902b revert googletest/test/gtest-param-test_test.cc
f729a28 Merge branch 'master' of github.com:gennadiycivil/googletest
8034001 Merge branch 'master' of https://github.com/google/googletest
505de1d Merge branch 'master' into master
6eccdb7 Update .travis.yml
2f31bfa Merge branch 'master' of https://github.com/google/googletest
d237297 code merge, cleanups
509e78b Merge pull request #1394 from gennadiycivil/master
2ad5661 Upstream of cl 129104714
5eecadf Revert one file
5d96565 Merge branch 'master' into support_xboxone
9fce984 wip, cleanups/merge
2301524 Merge pull request #1393 from gennadiycivil/master
1df9073 Merge branch 'master' into master
258fd6e cleanup, merge
0e6da4c Merge branch 'master' into fix-core-dump-shared
e194f52 Merge pull request #1388 from rongjiecomputer/bazel
cbd15d4 [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
c3bb0ee Merge pull request #1390 from gennadiycivil/master
91ba05c Small cleanups, merge
3d27bde Merge pull request #1387 from coryan/optimize-build-matrix-ready
4371b99 Merge pull request #1385 from gennadiycivil/master
fab0610 Merge branch 'master' into master
67d6e46 Use correct name for build event types.
67476c1 Revert one file for now
adfdc65 Fixed test for pull request.
5b26b0f Merge pull request #1007 from davidben/missing-declarations
d3acb4b Fixed output and test for 'enabled_on_pr'
6b4967a Merge branch 'master' into missing-declarations
abbc0f8 Merge pull request #1377 from davidben/clang-cl
19b5774 code cleanup in preparation for merges, cl 180857299
9cee677 Optimize build matrix (#1)
be6ee26 Merge pull request #1378 from gennadiycivil/master
4216f86 Merge branch 'master' into master
a501447 Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submodule
1c09831 upstreaming cl 124976692
1acf8c7 Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
b3d9be5 Pass the -Wmissing-declarations warning.
26addad Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
ba6eced Merge pull request #1374 from davidben/tuple-msvc
88760a2 Merge pull request #991 from davidben/uintptr
a3da63d Merge branch 'master' into tuple-msvc
a9fa67c Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
1414d71 Merge pull request #1376 from gennadiycivil/master
e7734fb OSS Sync, cl 163329677
90244a6 Fix testing::Combine on MSVC 2017.
fa67301 Merge branch 'master' into uintptr
1c2f190 Merge pull request #1109 from davidben/vs2017
555e6e7 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
bcd3552 Avoid warning C4619 in MSVC 2017.
ec2b0c3 Build both googletest and googlemock.
75b85d5 Create a autotools-based build for Travis.
e76c3f8 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
5490beb Merge pull request #778 from gpakosz/C4389
7990f56 Re-enable MSVC++ C4389 warning in CmdHelperEq()
0062e48 Merge pull request #1357 from bryanzim/master
e17907d Update internal_utils.cmake
773cc78 Merge branch 'master' into master
b5b6a07 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
a37eedc Merge pull request #1248 from aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
782384d Merge pull request #1212 from qzmfranklin/bazel
a7fceb4 Update gtest-param-test.h.pump
8a48f0e Update gtest-param-test.h.pump
058b318 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
a7bd372 Merge branch 'master' into bazel
8cbda54 Merge branch 'master' into master
f6c44fe Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
1865eca Merge pull request #1354 from coryan/fix-top-level-license
3e2cb75 Merge branch 'master' into josh/fix_scoped_class2
f34cbef Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license
23a014a Refactor docs about contributions to CONTRIBUTING.md.
4c8e288 Merge branch 'master' into master
cb95f31 Merge branch 'master' into fix-top-level-license
0fe9660 Merge pull request #1355 from coryan/blaze-build-travis
74a5306 remove extra line
3ea0631 remove implicit casts
ed811dc Merge branch 'master' into blaze-build-travis
f98c20b Merge branch 'master' into master
55fca19 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
5920230 Merge pull request #1333 from sam-lunt/use-system-includes
c82cd5e Also add documentation around becoming a contributor.
1184117 Wrong LICENSE file, sorry. Corrected. [skip ci]
bc3320b Implement bazel-based builds in Travis.
e22d344 Add Apache-2.0 LICENSE file.
10ef1d9 Merge branch 'master' into use-system-includes
d6a4478 Merge branch 'master' into master
cc372a0 Merge pull request #1340 from coryan/fix-googlemock-test-build-file
cf3adad Add licenses() directive for googlemock/tests.
a30e15b Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
8f90d46 Merge branch 'master' into fix-argc
4aae160 Merge branch 'master' into master
cdedd18 Merge branch 'master' into fix-core-dump-shared
4d1f930 Merge pull request #1345 from coryan/fix-travis-build-macOS
efc6aba Merge branch 'master' into fix-travis-build-macOS
887a6c6 Merge pull request #1348 from wmamrak/master
57bb0bb Remove C4996 warning in VS2017
3464f76 Improved description of VS std::tuple support
8d9d6bb Improved description of VS std::tuple support
4d50715 Fix location of `_NSGetArgv` correction.
ad383b2 Fix value pointed to by `_NSGetArgc()` on macOS
4aa05bd Only switch to g++-4.9 on Linux.
11d21b7 Merge branch 'master' into master
a868e61 Merge pull request #1225 from brian-peloton/master
aea8580 Run autoconf from top-level directory.
0663ce9 Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both.
9e23674 Merge branch 'master' into master
c5cba7d Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
ce919c3 Merge branch 'master' into use-system-includes
247a3d8 Merge pull request #1324 from whame/master
f46bd00 make includes system
6c093a2 Merge branch 'master' of https://github.com/google/googletest
a7269e2 replaced back accidently removed static_cast with consistent ImplicitCast_
4ba3803 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
49eb76d Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
82447f2 Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output
530885c Merge branch 'master' into master
d175c8b Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312
43d6ad7 Merge pull request #1308 from KindDragon/vs2017-ci
8866af0 remove markdown stars (bold) from code examples
1ae4096 fix for VS2017 deprecation of ::tr1::tuple change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces
b153bfd Enable CI for VS2017
3121b20 Merge pull request #1304 from m-gupta/gtestapifix
e93a15c Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-warning
060783b Merge branch 'master' into gtestapifix
20e2de7 Remove gcc 6 misleading indentations.
7684db3 Merge pull request #1218 from KindDragon/vs-build-fix
840c711 Fix gmock tests when std::unary_function unavailable
2641b02 Fix tests with VS2015 and VS2017
77380cd Enable C++11 features for VS2015 and VS2017
6d0bb75 Merge pull request #1139 from chehsunliu/master
1beff24 googletest: Add GTEST_API_ attribute to ThreadLocal class.
c208d8d Merge branch 'master' into master
69e48e9 Merge pull request #1300 from gennadiycivil/master
48986f9 Merge branch 'master' into master
54c2648 Workaround for Travis issue https://goo.gl/d5eV8o
27be0df Merge pull request #1298 from google/revert-1297-master
34aaf58 Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…"
5c95435 Merge pull request #1297 from gennadiycivil/master
dfed97a Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552
3282f9a Merge pull request #1288 from joealam/master
963932e Merge pull request #1292 from DariuszOstolski/master
ecb1c3d #1282: Doc typo fix
4597ec5 Updated README with information about C runtime dynamic/static linking issues in Windows
ceee80c Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
7b6561c Merge pull request #1275 from jwakely/pr/1273
b70cf1a Use gender-neutral pronouns in comments and docs
98024ad Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
f1a87d7 Merge pull request #1249 from stkhapugin/master
89f4518 Merge branch 'master' into master
bfc0ffc Merge pull request #1271 from google/revert-1245-2017_09_04_parametrized
d30a37e Revert "Allow macros inside of parametrized test names."
ff67968 Merge pull request #1245 from sheepmaster/2017_09_04_parametrized
4386393 Merge pull request #1265 from bkircher/redundant-decl
cf512a0 Swap reinterpret_cast for static_cast
d4af64c Remove redundant declaration
deace25 Merge pull request #1259 from ly2048/patch-1
b55abc3 Merge branch 'master' into patch-1
b1dd47c Merge pull request #1255 from yursha/patch-1
9681b4c Add explicit `CMAKE_DEBUG_POSTFIX` option
31b6155 Merge branch 'master' into patch-1
20e62ad Merge pull request #1242 from DarthGandalf/expect
c9cf07a Make the failure messages from EXPECT_EQ and friends actually symmetric,
834baf3 Merge branch 'master' into patch-1
6133038 Merge pull request #1227 from aninf-wo/hethi/unused-import
ecc5182 Merge pull request #1250 from aninf-wo/hethi/remove-linker-warning-on-non-existing-path
eb695b0 Merge branch 'master' into hethi/unused-import
3663d67 Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printf
4f68ab5 Fix ellipsis position in examples
def0b32 Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environment
803ab9a Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-path
c86fbd7 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
6508a66 Merge branch 'master' into master
1b5b246 Merge branch 'master' into hethi/unused-import
8620328 Merge branch 'master' into hethi/cleanup-travis-environment
894cdb8 Merge pull request #1251 from aninf-wo/hethi/drop-valgrind-installation-on-travis
f3500ce Merge pull request #1243 from aninf-wo/hethi/travis-release-build
6c0146f use GTEST_ATTRIBUTE_UNUSED_ instead of dummy function
e43a594 Merge branch 'master' into master
900cc4b Merge commit 'a33b6b091999d44f771761be03beb64d3af2350a' into user_logger_instead_of_printf
f6dde80 Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is expected to abort()
bc60b5a Merge branch 'master' into hethi/travis-release-build
a33b6b0 Merge pull request #1246 from aninf-wo/hethi/enable-travis-gcc-cache
8b49116 Merge branch 'master' into support_xboxone
8a3ccc3 Merge pull request #1247 from aninf-wo/hethi/enable-parallel-builds
a92c362 Merge branch 'master' into 2017_09_04_parametrized
78b1ff0 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
be94bf5 remove unused variables from travis environment
857ddea Merge pull request #975 from LebedevRI/respect-option
beca85f drop unused valgrind package from installation
dd8e4a6 reset ccache statistics at install
56f8222 show ccache statistics in log
83d8dd0 call clang via ccache on Linux
9a8794f add a cast
e8c6942 remove obsolete link_directories command
88b7652 Merge branch 'master' into hethi/unused-import
aa0b545 remove GTEST_HAS_PARAM_TESTS
fe97312 limit processors to use in Travis build to 4
98f2f15 install ccache on travis osx build slave
d96a038 set MAKEFLAGS to use multiple processors on Travis CI
48b0662 cache ccache
55fd999 avoid warning about unused variable
8abacca avoid -Wshadow warning on GCC
86e5f00 Add a non-parametrized test.
e7c9e80 Allow macros inside of parametrized test names.
520ad96 treat all warnings as errors for GCC (-Werror)
d15b8b4 switch one build to Release mode
7c6353d Merge pull request #900 from Gallaecio/patch-1
1a62d1b CMake: use threads if allowed and found, not just if found.
52b6ca3 Merge pull request #783 from tobbi/cppcheck_perf_fixes
e4f6c0b Merge pull request #1011 from zeitounator/wrong-version-reported
b3a1f87 Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-type
ee53b28 Merge branch 'master' into user_logger_instead_of_printf
69e794c Merge pull request #870 from KindDragon/mingw64-appveyour
633488a Merge branch 'master' into mingw64-appveyour
836c194 Merge pull request #1241 from aninf-wo/hethi/issue-635-old-links
8282229 Merge branch 'master' into mingw64-appveyour
2a720ac Merge branch 'master' into hethi/issue-1175-cmake-build-type
e033d8c change links from former code.google.com to current github repository
92e9207 Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-comment
7f27d8b Merge branch 'master' into hethi/issue-1175-cmake-build-type
84bd72b Merge branch 'master' into hethi/fix-faq-example-comment
14cf7f5 fix example's comment
a430e9c Merge pull request #865 from frosteyes/master
3eaba9f Merge branch 'master' into master
34355c0 Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
1a8ba67 Merge branch 'master' into hethi/unused-import
d6c46eb Merge branch 'master' into hethi/issue-1175-cmake-build-type
16bfba0 Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake
5dde668 AppVeyor MinGW-w64 test build
7f8fefa Merge pull request #1237 from sgraham/update-docs-3
cfcc89a Merge branch 'master' into hethi/issue-1175-cmake-build-type
fa70b84 Removed "Trivial"
c4e0161 removed internal link ( not allowed in OSS)
0eb49f4 Note that it is preferable for Googlers to create a CL internally first
bb1c4af Merge branch 'master' into master
9ba7946 create different python based tests for single and multi configuration build generators
c4ec2ac Merge branch 'master' into hethi/travis-unused-cmake
4db9a74 Merge branch 'master' into hethi/unused-import
47ad299 Revert "ask cmake for per-configuration output subdir"
5d431c6 Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide
73d58dd ask cmake for per-configuration output subdir
7529c8a remove obsolete comment regarding python tests on linux
f0c72bf fix SetUp/TearDownTestCase() in AdvancedGuide
dae044d use upper-case build type
cc246ec use build type set in .travis.yml
d6562b5 Merge branch 'master' into hethi/unused-import
c780e0e Merge branch 'master' into hethi/travis-unused-cmake
71e2858 Merge pull request #1226 from aninf-wo/hethi/fix-typo
5bd8e83 Merge branch 'master' into hethi/fix-typo
298cd5e Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105
b46755b Merge pull request #1229 from aninf-wo/hethi/typo-xUnit
58fd184 Merge branch 'master' into hethi/typo-xUnit
c4126e0 Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs
24ceb4f Merge pull request #1231 from aninf-wo/heth/travis-verbose-make
c3d1d33 Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA
bb8399e use plural verb as mentioned in issue #1105
29c07aa remove Yob's comma mentioned in issue #1105
d33861d run combined build only
4a45157 switch on verbose make
8364718 remove non-existing gmock_build_samples switch
30c1e00 Merge branch 'master' into hethi/typo-xUnit
96f3745 Merge pull request #1189 from alyssawilk/flag-default
fe760e9 fix typo: xUnit
b567aad remove unused TestCase import
daaed2b fix typo in comment and string (SetUpTestCase)
fa5d3b3 Applying lint checks from upstream google3
c003733 Merge branch 'refs/heads/master' into flag-default
4d26df7 Speed up printing of characters which need hex escaping
b43bfcf Merge pull request #1222 from KindDragon/vs-projects-fix3
a1c332c Merge branch 'master' into support_xboxone
a7eeb69 Merge branch 'master' into vs-projects-fix3
f259215 Merge pull request #1221 from KindDragon/vs-projects-fix2
cb8ebf5 Support x64 configuration for old VS2015 projects
45287f3 Remove gtest VS2005 projects
eabd5c9 Merge pull request #1186 from Dani-Hub/master
87327b1 Merge branch 'master' into master
c38baf9 Merge pull request #1219 from KindDragon/vs-projects-fix
ebc7b01 Merge branch 'master' into master
79cdf97 Merge branch 'master' into bazel
f4abce4 Merge branch 'master' into vs-projects-fix
863e026 Merge pull request #1220 from romkatv/property-matcher
88269cd Support x64 configuration for old VS2010 projects
f8514b8 Merge branch 'master' of github.com:Dani-Hub/googletest
d93ce9d Merge branch 'master' of github.com:Dani-Hub/googletest
fa3bb1a Merge branch 'master' of github.com:Dani-Hub/googletest
6404d45 Merge branch 'master' of github.com:Dani-Hub/googletest
966b549 Support ref-qualified member functions in Property().
8304d06 Merge branch 'master' into master
96f7ba8 Merge branch 'master' into wrong-version-reported
675686a Merge pull request #1206 from ShadowIce/methodname-in-exception
1ee8079 Remove unused variable
a838de3 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
3cf65b5 Added "explicit" as per compiler suggestion
026735d Proposing these changes, please review
f52c95d Merge branch 'master' into bazel
35737ac Merge branch 'master' into methodname-in-exception
780bae0 Merge pull request #1215 from henryiii/patch-1
5518a1d Adding CMake visibility policy setting
b0ed43e Change tabs to spaces in test case
99d0ef3 Also can build when included in source.
9538687 Remove trailing whitespaces in BUILD.bazel
3677725 Switch return type to class without default constructor
cc99900 Fix test if exceptions are not supported
95f18d9 adds test for NiceMock with unknown return value
cb91651 Merge branch 'master' into support_xboxone
1183503 Merge branch 'master' into methodname-in-exception
1fe692c Update README.md
b082ad2 Merge branch 'master' into support_xboxone
cf85f56 Merge branch 'master' into josh/fix_scoped_class2
8f233a7 Merge branch 'master' into methodname-in-exception
b7e8a99 Merge pull request #1205 from mwoehlke-kitware/fix-gtest-install
960de71 Merge branch 'master' into josh/fix_scoped_class2
a2803bc Handling invalid flag values
5b4166f Add function name to exception if there's no default action
9469fb6 Fix problem installing gtest when gmock enabled
5ed471c Merge pull request #1204 from gennadiycivil/master
08b1a1f Merge branch 'master' into master
3f3a3ad Change AppVeyor Status Badge to point to new AppVeyor Project Location
a4121dd Change AppVeyor Status Badge to point to new AppVeyor Project Location
ca76206 Removed extra colon in error log
e0fc65c Merge pull request #1197 from SoapGentoo/pkgconfig
0c3c811 Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf
8f04622 Use GTEST_LOG instead of printf
6219d60 Merge remote-tracking branch 'origin/master' into support_xboxone
c113a71 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
9cacce4 Add documentation for pkg-config
8604c4a Add support for pkgconfig
24696c3 Merge branch 'master' into master
673c975 Merge pull request #905 from iignatev/master
9816b96 Merge pull request #857 from KindDragon/patch-1
c7f4849 Merge pull request #919 from delaitre/patch-1
052df99 Merge pull request #749 from nholthaus/patch-1
e533ff4 Merge pull request #926 from bartshappee/patch-1
e3bd4cb Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
c81be0f Merge pull request #871 from tommyleo2/master
c523461 Merge pull request #937 from srz-zumix/fix-gtest-port-typo
4283f26 Merge pull request #957 from sglass68/sim
c822c85 Merge pull request #1164 from aninf-wo/hethi/remove-old-docs
1579064 Merge pull request #1127 from zulkarnine/patch-1
cfab28d Merge pull request #1192 from eduherminio/master
e578186 Merge pull request #1191 from gennadiycivil/master
97a8498 Addressing Comments
c3f6533 Addressing comments
b11b2e4 Merge branch 'master' of github.com:Dani-Hub/googletest
07bba78 Merge branch 'master' of github.com:Dani-Hub/googletest
4e284ee Update WORKSPACE
dc7214f say "former version" instead of "released version"
713b077 Fix scoped enum not working in gmock-gen.py
854b28f Minor style fixes
cb5b054 Added Copyright
b98e30b Initial Revision, review 164634031
6e1970e Adding a flag option to change the default mock type
75f0723 Merge pull request #1178 from aninf-wo/hethi/testsuite-hint
c09e9e6 clarify distinction regarding Test Case
0e8e0e0 Fix library install destinations
66a0369 WIP
2606c7a Merge branch 'master' of github.com:Dani-Hub/googletest
71ca4ba 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
484ec91 Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521: Add is_same type trait
5a5e3c1 Added googlemock tests
4f5c01b Added googlemock tests
ac885f3 WIP
33edcae be more specific on Test Case
b322d1d Merge pull request #1185 from eduherminio/master
67fcf00 Punctuation
e022dcd Merge branch 'master' into hethi/remove-old-docs
461713f Merge pull request #1123 from chromy/upstream-141765019
aadf53d Merge pull request #1122 from chromy/upstream-146491438
ab8f2b0 WIP, win testing
e66b6bc WIP, win testing
40a909b WIP, windows testing
a2006b2 WIP, windows testing
c75de0a WIP, windows testing
8815087 WIP
6ae9cc7 Merge pull request #925 from edgarriba/patch-1
40aa72c Merge pull request #675 from theHacker/master
f8d909d Merge pull request #1173 from shlomif/correct-typo
22d1a7a Merge pull request #909 from AsturaPhoenix/patch-1
7890f72 Merge pull request #1180 from aconverse/master
ca6a70c Pass MSVC's C4826 warning.
eb261b4 Merge pull request #1176 from aninf-wo/hethi/typo
aecea38 Samples changes upstreaming
52a9c14 Samples changes upstreaming
0f702ce add note about different definitions of Test Case
212f4d7 fix small typo in comment
aac4033 Correct some typos in a comment
deb99a9 Use wider types to prevent unsigned overflow diagnostics
ca102b1 Merge pull request #1030 from vpfautz/master
50f3baf Merge pull request #1172 from joelypoley/joelypoley-patch-1
568958e Fixed cmake policy issue
28bb854 Merge pull request #1042 from danilcha/patch-1
fa388e9 Merge pull request #1170 from Manozco/1169_fix_old_cmake_issue
b68f1e7 Fix policy issue with old cmakes
d655d09 Merge pull request #867 from marzojr/patch-1
e1f3d8d Merge pull request #671 from mehagar/patch-1
683fcf5 Merge pull request #782 from Manozco/709-cmake-policy-project-version
0cb2eeb Merge pull request #764 from flyd1005/wip-fix-typo
73f3215 Merge pull request #962 from klimkin/klimkin-patch-typo
032baa0 Merge pull request #998 from dawikur/patch-1
d966d5f Merge pull request #968 from nicolacavallini/link_typed_test_docs
aa31cb6 WIP
6615f7d WIP
e2e37c9 Merge pull request #1147 from pbos/gtest_parallel_link
b3edada WIP
f63e2a1 WIP
7755e5d Merge pull request #1167 from krizalys/fix-typo
f08b1c3 Merge pull request #1165 from aninf-wo/hethi/fix-doc-links
623616a Fixed typo
ec19d45 fix links to Google C++ Style Guide
6b89677 remove doc of former versions
58b4227 remove obsolete reference to SVN trunk and fix link to pump manual
b390840 remove doc of former versions
f6ac9a3 remove obsolete reference to SVN trunk
e5b88b2 Merge pull request #1137 from coryan/master
6527ee0 Merge pull request #1107 from lipk/patch-1
75bb586 Merge pull request #1158 from junr03/fix-link
5c27913 docs: fix broken link
b9427ca Merge pull request #1143 from nyibbang/patch-1
7c3496c Merge pull request #1126 from junr03/fix-broken-link
2960aa5 Remove duplicate code
a6b146d Fix assumption for foreground bit offset
1b39c3d Add gtest-parallel to open-source projects.
4568374 Fixes a typo in FAQ.md
509f7fe Update googletest README.md
0ffd862 More tables that did not render correctly.
2fcbc0c Remove silly claim that C++ lacks lambdas.
f20797b Same fixes for "current" version.
1dde1ee Fix typos too s/destoyed/destroyed/
280b227 Fix table formatting.
c958e26 *Silence false positive memory leaks reported by Microsoft's debug CRT*
6a75e3c Remove unnecessary const
26b7ac3 Add helper functions for text color calculation
4bab34d Merge pull request #1081 from krytarowski/netbsd-1
f050aff Merge pull request #1129 from Chris-Sharpe/master
271fb8f Fix a problem when bg_color == fg_color
19cace2 Colouring in help text
365df11 Add background_mask instead of using magic number
649aa29 Fix background color in ColoredPrintf
38ec2a1 docs: fix broken link from dummies guide to cook book
41ad243 Fix typo in gmock-actions.h
24054ff Fixed misspelling in assertion message.
e494290 Allow death test child to bypass WER under MinGW
c2d90bd Create gtest-internal.h
a44bbab Merge pull request #1113 from jorgehb/patch-1
00ed9b5 Fixing float comparison broken link
dca9d5f Remove unnecessary 'the'.
42bc671 Merge pull request #1091 from nico/wmicro
59c795c Merge pull request #1096 from gennadiycivil/add-ability-for-custom-temdir-1093
76491b7 Changes add ability to overwrite TempDir(), issue https://github.com/google/googletest/issues/1093
7cc548d Merge pull request #1089 from nico/stdstring
078d5d9 Merge pull request #1090 from nico/typo
2a5d67c Merge pull request #1092 from nico/comment
e1466ba Gender-neutralize comments in gtest.h.
09fd5b3 Use std::string and ::string explicitly in gtest and gmock code.
b2cbbec Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
6c0c8a7 Fixing typo in documentation.
294f72b Merge pull request #725 from donhuff/xcode-headers
8c7f93f Merge pull request #1078 from pwnall/gtest_api_port
887d569 Merge pull request #965 from davidben/format-attr
fac0dfb Add NetBSD support
b7cf441 Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
0ad83af Merge pull request #1034 from dankegel/master
69c6db2 Merge pull request #1077 from gennadiycivil/make-temp-dir-public-issue-1076
611e8a9 Changes to make TempDir() public
a6418a4 Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
5ff6805 Again rewrote everything
81bc876 Added explicit gtest library dependency
b6c4d43 Update README.md
b2521c8 Update README.md
518e051 Minimal changes to fix build failures on Microsoft Visual Studio 2015
a2451c7 Fixed some typos
aa148eb Merge pull request #1029 from google/BillyDonahue-patch-3
ba63868 Remove /tree/ from Readme.md links.
51143d5 Merge pull request #996 from srz-zumix/fix-error
b74070c googlemock version must be changed as well
fa892af Wrong version reported (1.7.0 should be 1.8.0)
51d92b2 Replace html entities with their equivalents
9655b9f fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/
d62d6c6 Merge pull request #982 from mbjorge/unused-variable-fix
9ae086a Merge pull request #874 from sejr/master
3134af2 Merge pull request #1 from google/master
06a81e9 Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_P
2eaab21 added link to sample 6 in the documentation of typed test
53c478d Annotate ColoredPrintf with the format attribute and fix bugs.
5e7fd50 Merge pull request #658 from audiofanatic/ExternalProject_at_configure_time
c0059a7 2.6.4 is the minimum CMake version, so enforce it (#656)
cb502b7 Added CMake configure-time download instructions to docs
3ec0052 Fix a typo
0fdf78b Fix a few documentation nits in the mock dummies guide
75b683d Fix or condition typo ( '|' -> '||' )
bef93f3 Fix small typo SeArrayArgument
21ccd61 update README.md with tiny-dnn
008e54c Fix #923 - support CMAKE_CROSSCOMPILING_EMULATOR for tests
a2b8a8e Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONE
9697746 Fix the link to the float comparison article
3447fc3 Merge pull request #728 from DanAlbert/tuple-stlport
4eafafb Fix detection of GTEST_HAS_CLONE for Android.
0b6d947 Update Primer.md
7fbc598 enable null detection on Solaris Studio 12u4+
194e3c8 Fix WhenSorted() documentation example
ecd5308 Merge pull request #876 from marco-m/patch-1
8ce0b59 Cookbok: fix broken relative link
32b4a9b Fixed broken links
0e0ff5c blob vs tree
960a511 Fixing relative links
995db99 Fixing KnownIssues and FrequentlyAskedQuestions links
f5c0130 Broken relative links fixed
9cb03aa Fixing ForDummies link
51b290d One works
16d6af7 Relative links
10ff7f9 Fixing relative links
48ee8e9 Merge pull request #856 from KindDragon/mingw-appveyor
d8fe70f Fix build with MinGW-w64
f700442 Clarifying language
82396f2 Update Primer.md
68f19fa Moved the ignoring of *.pyc files to top level for also covering googlemock python scripts.
1cff146 Add links to IRC channel and Google Group
ed9d1e1 Merge pull request #721 from ilmagico/fix-mingw-threads
ec44c6c Merge pull request #821 from mazong1123/master
dc2dbf1 Reformatted the Unprintable operator== code style.
531bf5c Fixed issue #775
d406cb1 Merge pull request #814 from google/BillyDonahue-patch-2
e51026e Add Appveyor badge to Readme.md
8134585 Merge pull request #723 from KindDragon/master
43c0ae3 Support running MSVC build on AppVeyour
10799ab Merge pull request #810 from google/rollback_808
ce7ec96 Rollback change #808.
faee7d1 Merge pull request #808 from djmott/master
2489c30 Fix to tests that return object which implement operator bool
e35015f fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that implement operator bool
08d76be Performance fixes reported by cppcheck
a7ab054 Issue 709: Fix Cmake policy 0048
0a43962 Merge pull request #773 from mazong1123/master
5bae126 Added VS 2015 project support.
01f3d09 Updated the value of GTEST_DIR to reflect the googletest dir.
2746b57 Changed the GTestDir marco value to reflect the new dir of googletest.
266a185 remove duplicated words
1d1b306 made capitalization more consistent with other projects.
c88525f added related open source project
d225acc Merge pull request #741 from mbinna/patch-1
2071474 Fix whitespace in paragraph
72416fa Merge pull request #724 from duggelz/master
d254052 Update C++ language and library settings to match SDK projects.
eba1796 Merge pull request #735 from phad/patch-1
0098be3 Fix typo (Inovke -> Invoke)
f7248d8 Merge pull request #731 from mattrajca/patch-1
62700bd Fixed typo ('XCode' -> 'Xcode')
3429113 Fix a test to compile when tuple isn't available.
d23cf2b Restructure test so each scenario is independent.
6991f42 Fix env_var_test to ignore XML_OUTPUT_FILE if already set
5db9cbb Restructure $XML_OUTPUT_FILE logic
12b2f23 Fix inconsistent style
407b0aa Add missing headers to Xcode framework target.
d6790f2 Read Bazel's $XML_OUTPUT_FILE environment variable
a138385 Don't use pthread when on MinGW even if available
9759dcd Fix compilation on MinGW with native threads
ff07a5d Merge pull request #719 from paul-wilkinson/docs_formatting_fix
83d3b47 Fix formatting in AdvancedGuide.md
77d6b17 Merge pull request #713 from DarthGandalf/expect
5909d44 Merge pull request #715 from jacob-meacham/bugfix/expect-call
f5acf22 Merge pull request #716 from jacob-meacham/feature/gitignore
d4aa34b Fix link that's returned when running tests. #714
b648a30 Add build artifacts to git ignore.
f364e18 Change error message of EXPECT_EQ to treat lhs and rhs equivalently.
ff5ffd4 Merge pull request #688 from tamland/python3
a9b73f8 Merge pull request #699 from achimnol/master
340c6b3 Add tmux and tmux-256color to the colored terminal list.
82b11b8 Merge pull request #678 from pjaytycy/master
456fc2b add python 3 support to fuse_gtest_files script
d404af0 add python 3 support to tests
d8df1fb Add link to Google Test Primer docs in README.md
62b167e Fix: Markdown in V1_7_Primer.md
ff72632 Fix typo in AdvancedGuide.md
13206d6 Merge pull request #670 from dawikur/master
ac35fe7 Update GTEST_PROJECT_URL_ in internal/gtest-port.h
ddb8012 Merge pull request #602 from mtbrandy/threadcount_aix
0162ff7 Merge pull request #657 from audiofanatic/issue655-targetHeaderDeps
c1cd9c2 Merge pull request #650 from jpuigcerver/master
57b376a Merge pull request #660 from waynix/FixLinks
a470862 fixed link in googlemock documentation
f601ee1 Add include dirs to targets if CMake version supports it
35fb11e Merge pull request #654 from cmorse/doc_fix
ebd1d08 Fix link to FAQ in Primer.md
7c8ac48 Added CMake install rules for GMock
1f8fe13 Merge pull request #647 from mithro/patch-1
16b9bbc Fix AdvancedGuide link in FAQ.md
2f93e2d Merge pull request #636 from ReadmeCritic/master
6fe019e Merge pull request #607 from google/BillyDonahue-patch-1
3c3a4ac Merge pull request #640 from Ali-Se/patch-2
96bba4d Merge pull request #638 from KindDragon/patch-1
ccd0f94 Merge pull request #592 from Ferenc-/master
25409ab Fixing some table error in file
83b93ea Update FAQ.md
3aef7d7 Update README URLs based on HTTP redirects
ffce1a8 Merge pull request #633 from plopresti/master
f44190f Fix missing-field-initializers GCC/Clang warning (issue 433).
93c37d5 Merge pull request #632 from nocnokneo/add-cmake-install-rules
884dd08 Merge pull request #628 from fjunqueira/patch-1
c4c2354 Merge pull request #614 from DukeXar/master
98d988d Add CMake install rules for gtest libraries and headers
786564f Merge pull request #627 from mark-chromium/tests_msvs
4a8e544 Name the helper AsBits()
cfe466a Use a templated helper to wrap the cast
cbce23f Leave decltype(max_ulps_) alone and cast, not sure this is better
322a491 Better use of character constants
4a0b77f Create CMakeLists.txt
8b085f0 Fix warnings encountered in MSVC build of gtest/gmock tests
71a26ac Merge pull request #612 from mark-chromium/gmock_rtti
5bd7c2b Merge pull request #611 from mark-chromium/gmock_cxx11
cf51737 Merge pull request #605 from d-meiser/fix-visibility-hidden
84d7ff1 Fix symbol visibility of StreamingListener.
580378d Add an option to enable building with -fvisibility=hidden.
bb5c92f Fix definition of GTEST_API_ macro for gcc and clang [#451].
4335964 Merge pull request #616 from anuragsoni/documentation/fix-readme-for-googletest
788dee9 update googletest readme to fix broken links
6705b9a Override clang++ name on Linux only
bbbc025 More docs in travis config
b8f9b2b Update clang version
e8193fe Adding llvm toolchain repo
c76f9e0 Update .travis.yml
231af5d Try to use clang-3.6 in travis
58b5435 Update .travis.yml
c81cf6b Update .travis.yml
c8a1050 googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
a0435dc googlemock: Support C++11 language with pre-C++11 library
554ca00 Update DevGuide.md
7f4448f Merge pull request #604 from marco-m/urls-should-go-to-github
6adbc86 Fix relative links in documentation
c65f6ce Update URLs from googlecode to github
bf7e9e8 Add include of sys/types.h.
a7964a3 Implement GetThreadCount for AIX.
0dd5ef8 Merge pull request #597 from marco-m/patch-1
e35cee9 Fix broken link to FrequentlyAskedQuestions
9751f4d Merge pull request #594 from martinmaly/gmock
c8c8f8c Merge pull request #593 from martinmaly/distcheck
210392e Adding missing files to googlemock distribution.
48368f0 Adding missing header files to the distribution.
30846f3 Fix typo in googlemock/README.md
b16fc6a Merge pull request #591 from google/BillyDonahue-patch-1
8cb0499 Fix relative links in googlemock docs.
31eb85e Merge pull request #589 from nomis52/master
39062f4 Fix the googlemock autotools build.
de411c3 Merge pull request #585 from orgads/warning-fix
904ad18 Fix unused static variable warning on Windows
b78f858 Include <memory> to use std::unique_ptr.
f19b060 Googlemock has some tuples containing lvalue refs in its unit tests. These tuples are created with make_tuple, which is given temporaries. The make_tuple is in a function argument list.
99166db Merge pull request #579 from daus-salar/patch-1
11ae388 Merge pull request #582 from dmircevski/build-c++11
517b3bd Add c++11 build to the Travis matrix.
6460005 FIX add missing blank line between text and table
Change-Id: I76292b2f128cd7f314fb89a97124baf3fda8e649
git-subtree-dir: third_party/googletest
git-subtree-split: 2fe3bd994b3189899d93f1d5a881e725e046fdc2
diff --git a/googlemock/configure.ac b/googlemock/configure.ac
index d268d5d..cb5e1a6 100644
--- a/googlemock/configure.ac
+++ b/googlemock/configure.ac
@@ -1,7 +1,7 @@
-m4_include(gtest/m4/acx_pthread.m4)
+m4_include(../googletest/m4/acx_pthread.m4)
AC_INIT([Google C++ Mocking Framework],
- [1.7.0],
+ [1.8.0],
[googlemock@googlegroups.com],
[gmock])
@@ -101,7 +101,7 @@
[The version of Google Test available.])
HAVE_BUILT_GTEST="no"
-GTEST_MIN_VERSION="1.7.0"
+GTEST_MIN_VERSION="1.8.0"
AS_IF([test "x${enable_external_gtest}" = "xyes"],
[# Begin filling in variables as we are able.
@@ -129,14 +129,14 @@
GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
GTEST_LIBS=`${GTEST_CONFIG} --libs`
GTEST_VERSION=`${GTEST_CONFIG} --version`],
- [AC_CONFIG_SUBDIRS([gtest])
- # GTEST_CONFIG needs to be executable both in a Makefile environmont and
+ [
+ # GTEST_CONFIG needs to be executable both in a Makefile environment and
# in a shell script environment, so resolve an absolute path for it here.
- GTEST_CONFIG="`pwd -P`/gtest/scripts/gtest-config"
- GTEST_CPPFLAGS='-I$(top_srcdir)/gtest/include'
+ GTEST_CONFIG="`pwd -P`/../googletest/scripts/gtest-config"
+ GTEST_CPPFLAGS='-I$(top_srcdir)/../googletest/include'
GTEST_CXXFLAGS='-g'
GTEST_LDFLAGS=''
- GTEST_LIBS='$(top_builddir)/gtest/lib/libgtest.la'
+ GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la'
GTEST_VERSION="${GTEST_MIN_VERSION}"])
# TODO(chandlerc@google.com) Check the types, structures, and other compiler