Diffusion sp4e-homework-lars-bertil fc437ef4b2c0

Merge branch 'master' into upstream_188748737
fc437ef4b2c0
Actions

Authored by Bernhard Bauer <sheepmaster@gmail.com> on Mar 12 2018, 19:15.

Description

Merge branch 'master' into upstream_188748737

Details

Committed

GitHub <noreply@github.com>

Mar 12 2018, 19:15

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:abc6e943e087: Merge pull request #1502 from gennadiycivil/master
R9484:7b70413e0ca5: Allow macros inside of parametrized test names.

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:fc437ef4b2c0: Merge branch 'master' into upstream_188748737 (authored by Bernhard Bauer <sheepmaster@gmail.com>).Mar 12 2018, 19:15

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
abc6e943e087	Gennadiy Civil/GitHub	Merge pull request #1502 from gennadiycivil/master	Mar 12 2018
cf9d6344d280	Gennadiy Civil	merges-port(1)	Mar 12 2018
9bda90b7e5e0	Gennadiy Civil/GitHub	Merge pull request #1497 from gennadiycivil/master	Mar 7 2018
e89190066608	Gennadiy Civil	Merging, XML tests	Mar 7 2018
703b4a85a21e	Gennadiy Civil/GitHub	Merge pull request #1493 from gennadiycivil/master	Mar 5 2018
89d6f70f34a2	Gennadiy Civil	merges-8	Mar 5 2018
617e2c561578	Gennadiy Civil/GitHub	Merge pull request #1492 from gennadiycivil/master	Mar 5 2018
995a9dfa6941	Gennadiy Civil	merges-7	Mar 5 2018
ae4480f9232e	Gennadiy Civil/GitHub	Merge pull request #1491 from gennadiycivil/master	Mar 5 2018
086825de5d5c	Gennadiy Civil	merges-6	Mar 5 2018
731dbc4a7879	Gennadiy Civil/GitHub	Merge pull request #1490 from gennadiycivil/master	Mar 5 2018
94d78ea14b70	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Mar 5 2018
83859284289f	Gennadiy Civil	merges-3	Mar 5 2018
c3a007f3cf1a	Gennadiy Civil/GitHub	Merge pull request #1489 from gennadiycivil/master	Mar 5 2018
73bf41299d19	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Mar 5 2018
dbf63e38a4eb	Gennadiy Civil	merges-2	Mar 5 2018
a7ffeca97406	Gennadiy Civil/GitHub	Merge pull request #1488 from gennadiycivil/master	Mar 5 2018
a518bd5cf27f	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Mar 5 2018
0d5e01ad7bf0	Gennadiy Civil	Merges-1	Mar 5 2018
915c8d051d0a	Gennadiy Civil/GitHub	Merge pull request #1477 from sgraham/unsigned-wchar	Mar 5 2018
829a8c966b80	Gennadiy Civil/GitHub	Merge branch 'master' into unsigned-wchar	Mar 5 2018
6c73adfc03e2	Gennadiy Civil/GitHub	Merge pull request #1486 from petrhosek/json-stacktrace	Mar 2 2018
7a2050d4d7ee	Petr Hosek	Use a full message in the JSON output for failures	Mar 1 2018
f8fbe1c82175	Gennadiy Civil/GitHub	Merge branch 'master' into unsigned-wchar	Mar 1 2018
447d58b4ee8e	Gennadiy Civil/GitHub	Merge pull request #1485 from coryan/parallelize-appveyor	Feb 28 2018
18d270e335c4	Gennadiy Civil/GitHub	Merge pull request #1479 from petrhosek/json	Feb 28 2018
3817871beb53	Gennadiy Civil/GitHub	Merge branch 'master' into json	Feb 28 2018
3431b6990980	Carlos O'Ryan	Add options to parallelize builds.	Feb 28 2018
9557d29b7a5f	Gennadiy Civil/GitHub	Merge pull request #1481 from dneto0/debug-postfix	Feb 28 2018
66d71756a72a	Gennadiy Civil/GitHub	Merge branch 'master' into debug-postfix	Feb 28 2018
6baf17e9d111	Petr Hosek	Support JSON output format in addition to XML	Feb 28 2018
fe1144246e7e	Gennadiy Civil/GitHub	Merge pull request #1482 from zhangxy988/variant_matcher	Feb 27 2018
e1622337aebe	Xiaoyi Zhang	Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into…	Feb 27 2018
576d689c19f0	Xiaoyi Zhang/GitHub	Merge branch 'master' into variant_matcher	Feb 27 2018
62be6f34d175	Xiaoyi Zhang	Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into…	Feb 27 2018
2eb31c185cfd	Xiaoyi Zhang	Add documentation for VariantWith.	Feb 27 2018
a9f2368dc07c	Gennadiy Civil/GitHub	Merge pull request #1483 from gennadiycivil/master	Feb 27 2018
ba40fd145695	Gennadiy Civil/GitHub	Merge branch 'master' into master	Feb 27 2018
ce61dc54a20f	Gennadiy Civil/GitHub	Merge pull request #1423 from pcc/win-libcxx2	Feb 27 2018
2bd1750ba7bd	Gennadiy Civil	gmock merging -2	Feb 27 2018
837c24637040	Gennadiy Civil/GitHub	Merge branch 'master' into unsigned-wchar	Feb 27 2018
ab46d9550bba	Gennadiy Civil/GitHub	Merge branch 'master' into debug-postfix	Feb 27 2018
b951c652ff8b	Gennadiy Civil/GitHub	Merge branch 'master' into variant_matcher	Feb 27 2018
7d15497f7538	Gennadiy Civil/GitHub	Merge pull request #1464 from pwnall/death-style	Feb 27 2018
190e2cdd0b55	Xiaoyi Zhang	Add matcher for std::variant.	Feb 27 2018
84ec2e0365d7	Victor Costan	Switch default death test style back to "fast".	Feb 27 2018
d4f77c1e3a34	Gennadiy Civil/GitHub	Merge branch 'master' into win-libcxx2	Feb 27 2018
20074be19a9c	David Neto	Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX	Feb 26 2018
5e1bca7376f0	Gennadiy Civil/GitHub	Merge branch 'master' into unsigned-wchar	Feb 26 2018
ac34e6c95092	Gennadiy Civil/GitHub	Merge pull request #1472 from AndersSundmanTobii/master	Feb 26 2018

Changes (64)

				Path
	M			BUILD.bazel
	M			README.md
	M			WORKSPACE
	M			appveyor.yml
	M			ci/build-linux-bazel.sh
	M			googlemock/docs/CheatSheet.md
	M			googlemock/docs/CookBook.md
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/gmock.h
	M			googlemock/include/gmock/internal/custom/gmock-matchers.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-port.h
	M			googlemock/scripts/generator/cpp/ast.py
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/src/gmock.cc
	M			googlemock/test/BUILD.bazel
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock_link_test.h
	M			googlemock/test/gmock_output_test.py
	M			googlemock/test/gmock_stress_test.cc
	M			googlemock/test/gmock_test.cc
	M			googlemock/test/gmock_test_utils.py
	M			googletest/CMakeLists.txt
	M			googletest/cmake/internal_utils.cmake
	M			googletest/docs/AdvancedGuide.md
	M			googletest/docs/Documentation.md
	M			googletest/docs/FAQ.md
	M			googletest/docs/Primer.md
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/gtest_prod.h
	M			googletest/include/gtest/internal/gtest-death-test-internal.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-filepath.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-printers.cc
	M			googletest/src/gtest-typed-test.cc
	M			googletest/src/gtest.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/gtest-death-test_test.cc
	M			googletest/test/gtest-param-test_test.cc
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest_all_test.cc
	P			googletest/test/gtest_assert_by_exception_test.cc Copied from googletest/test/gtest_throw_on_failure_ex_test.cc
	M			googletest/test/gtest_env_var_test_.cc
	P			googletest/test/gtest_json_outfiles_test.py Copied from googletest/test/gtest_xml_outfiles_test.py
	A			googletest/test/gtest_json_output_unittest.py
	P			googletest/test/gtest_json_test_utils.py Copied from googletest/xcode/Samples/FrameworkSample/runtests.sh
	M			googletest/test/gtest_main_unittest.cc
	M			googletest/test/gtest_uninitialized_test.py
	M			googletest/test/gtest_uninitialized_test_.cc
	M			googletest/test/gtest_unittest.cc
	P			googletest/test/gtest_xml_outfiles_test.py Copied to googletest/test/gtest_json_outfiles_test.py
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/test/gtest_xml_test_utils.py
	M			googletest/xcode/Scripts/versiongenerate.py