Diffusion sp4e-homework-lars-bertil a7a7f51d3550

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
a7a7f51d3550
Actions

Authored by Tanzinul Islam <tanzislam@users.noreply.github.com> on Mar 5 2018, 03:25.

Description

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

Details

Committed

GitHub <noreply@github.com>

Mar 5 2018, 03:25

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:4ba3803f936a: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
R9484:6c73adfc03e2: Merge pull request #1486 from petrhosek/json-stacktrace

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:a7a7f51d3550: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 (authored by Tanzinul Islam <tanzislam@users.noreply.github.com>).Mar 5 2018, 03:25

Merged Changes

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

Commit	Author	Details	Committed
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
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
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
ac34e6c95092	Gennadiy Civil/GitHub	Merge pull request #1472 from AndersSundmanTobii/master	Feb 26 2018
aa31660d18c9	Gennadiy Civil/GitHub	Merge branch 'master' into master	Feb 26 2018
1d324d849197	Gennadiy Civil/GitHub	Merge pull request #1475 from gennadiycivil/master	Feb 26 2018
4dbb4371741c	Gennadiy Civil	merging unittests - 5	Feb 26 2018
004f6a00b20e	Gennadiy Civil	merging unitests - check 4	Feb 23 2018
194c99b942f3	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 23 2018
3a4cf1a02ef4	Gennadiy Civil/GitHub	Merge pull request #1474 from gennadiycivil/master	Feb 23 2018
29e9ca877434	Gennadiy Civil	merging unitests, check	Feb 23 2018
3299a2386cf2	Gennadiy Civil	merging unittests - 2	Feb 23 2018
c0563458eef2	Gennadiy Civil/GitHub	Merge pull request #1473 from gennadiycivil/master	Feb 23 2018
b7e0294c5133	Gennadiy Civil	merging unitests	Feb 23 2018
70e1aad72c49	Gennadiy Civil/GitHub	Merge pull request #1471 from aleksejkozin/patch-1	Feb 23 2018
11e1dd257b80	Anders Sundman (asum)	Removed trailing comma in enum	Feb 23 2018
99bb4fe85a20	Aleksey Kozin/GitHub	Merge branch 'master' into patch-1	Feb 22 2018
a490fb7a9a00	Gennadiy Civil/GitHub	Merge pull request #1466 from pwnall/fix-death-warn	Feb 22 2018
06568301ec4a	Aleksey Kozin/GitHub	TEST() arguments are invalid in an example	Feb 22 2018
ac138b688537	Gennadiy Civil/GitHub	Merge branch 'master' into fix-death-warn	Feb 22 2018
32e62da22a1b	Gennadiy Civil/GitHub	Merge pull request #1469 from gennadiycivil/master	Feb 22 2018
df65632489dc	Gennadiy Civil	merges	Feb 22 2018
8a6158717bc1	Victor Costan	Fix unused function warning on Mac OS.	Feb 19 2018
3f0cf6b62ad1	Gennadiy Civil/GitHub	Merge pull request #1450 from pwnall/fix-printers	Feb 15 2018
8dd1eb5984fb	Gennadiy Civil/GitHub	Merge branch 'master' into fix-printers	Feb 15 2018
42140509b6fc	Gennadiy Civil/GitHub	Merge pull request #1459 from gennadiycivil/master	Feb 13 2018
8248169287b9	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 13 2018
a3e322b24f9a	Gennadiy Civil	cleanup, merges	Feb 13 2018

Changes (141)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		.travis.yml
M		BUILD.bazel
A		CONTRIBUTING.md
A		LICENSE
A		Makefile.am
M		README.md
M		WORKSPACE
M		appveyor.yml
A	(dir)	ci/
P		ci/build-linux-autotools.sh Copied from googlemock/test/BUILD.bazel
P		ci/build-linux-bazel.sh Copied from googlemock/test/BUILD.bazel
P		ci/env-linux.sh Copied from googlemock/test/BUILD.bazel
P		ci/env-osx.sh Copied from googlemock/test/BUILD.bazel
P		ci/get-nprocessors.sh Copied from googlemock/test/BUILD.bazel
P		ci/install-linux.sh Copied from googlemock/test/BUILD.bazel
P		ci/install-osx.sh Copied from googlemock/test/BUILD.bazel
P		ci/log-config.sh Copied from googlemock/test/BUILD.bazel
V		{ci ← }/travis.sh
A		configure.ac
M		googlemock/CMakeLists.txt
M		googlemock/README.md
M		googlemock/configure.ac
M		googlemock/docs/CheatSheet.md
M		googlemock/docs/CookBook.md
D		googlemock/docs/DevGuide.md
M		googlemock/docs/Documentation.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/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-spec-builders.cc
P		googlemock/test/BUILD.bazel Copied to multiple locations: ci/build-linux-autotools.sh ci/build-linux-bazel.sh ci/env-linux.sh ci/env-osx.sh ci/get-nprocessors.sh ci/install-linux.sh ci/install-osx.sh ci/log-config.sh googletest/test/gtest_json_test_utils.py
M		googlemock/test/gmock-actions_test.cc
M		googlemock/test/gmock-internal-utils_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/Makefile.am
M		googletest/README.md
D		googletest/build-aux
D		googletest/build-aux/.keep
M		googletest/cmake/internal_utils.cmake
M		googletest/docs/AdvancedGuide.md
D		googletest/docs/DevGuide.md
M		googletest/docs/Documentation.md
M		googletest/docs/FAQ.md
M		googletest/docs/Primer.md
M		googletest/include/gtest/gtest-death-test.h
M		googletest/include/gtest/gtest-message.h
M		googletest/include/gtest/gtest-param-test.h
M		googletest/include/gtest/gtest-param-test.h.pump
M		googletest/include/gtest/gtest-printers.h
M		googletest/include/gtest/gtest-typed-test.h
M		googletest/include/gtest/gtest.h
M		googletest/include/gtest/gtest_pred_impl.h
M		googletest/include/gtest/gtest_prod.h
M		googletest/include/gtest/internal/custom/gtest-port.h
M		googletest/include/gtest/internal/custom/gtest.h
M		googletest/include/gtest/internal/gtest-death-test-internal.h
M		googletest/include/gtest/internal/gtest-filepath.h
M		googletest/include/gtest/internal/gtest-internal.h
M		googletest/include/gtest/internal/gtest-param-util-generated.h
M		googletest/include/gtest/internal/gtest-param-util-generated.h.pump
M		googletest/include/gtest/internal/gtest-param-util.h
M		googletest/include/gtest/internal/gtest-port-arch.h
M		googletest/include/gtest/internal/gtest-port.h
M		googletest/include/gtest/internal/gtest-string.h
M		googletest/samples/prime_tables.h
M		googletest/samples/sample4_unittest.cc
M		googletest/samples/sample5_unittest.cc
M		googletest/samples/sample7_unittest.cc
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-test-part.cc
M		googletest/src/gtest-typed-test.cc
M		googletest/src/gtest.cc
M		googletest/src/gtest_main.cc
M		googletest/test/BUILD.bazel
M		googletest/test/gtest-death-test_test.cc
M		googletest/test/gtest-filepath_test.cc
M		googletest/test/gtest-options_test.cc
M		googletest/test/gtest-param-test2_test.cc
M		googletest/test/gtest-param-test_test.cc
M		googletest/test/gtest-param-test_test.h
M		googletest/test/gtest-port_test.cc
M		googletest/test/gtest-printers_test.cc
M		googletest/test/gtest-typed-test2_test.cc
M		googletest/test/gtest-typed-test_test.cc
M		googletest/test/gtest_all_test.cc
A		googletest/test/gtest_assert_by_exception_test.cc
M		googletest/test/gtest_break_on_failure_unittest.py
M		googletest/test/gtest_break_on_failure_unittest_.cc
M		googletest/test/gtest_catch_exceptions_test.py
M		googletest/test/gtest_color_test.py
M		googletest/test/gtest_color_test_.cc
M		googletest/test/gtest_env_var_test.py
M		googletest/test/gtest_env_var_test_.cc
M		googletest/test/gtest_environment_test.cc
M		googletest/test/gtest_filter_unittest.py
M		googletest/test/gtest_filter_unittest_.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 googlemock/test/BUILD.bazel
M		googletest/test/gtest_list_tests_unittest.py
M		googletest/test/gtest_main_unittest.cc
M		googletest/test/gtest_output_test.py
M		googletest/test/gtest_output_test_.cc
M		googletest/test/gtest_output_test_golden_lin.txt
M		googletest/test/gtest_pred_impl_unittest.cc
M		googletest/test/gtest_prod_test.cc
M		googletest/test/gtest_repeat_test.cc
M		googletest/test/gtest_stress_test.cc
M		googletest/test/gtest_test_utils.py
M		googletest/test/gtest_throw_on_failure_test.py
M		googletest/test/gtest_uninitialized_test.py
M		googletest/test/gtest_uninitialized_test_.cc
M		googletest/test/gtest_unittest.cc
M		googletest/test/gtest_xml_outfile1_test_.cc
M		googletest/test/gtest_xml_outfile2_test_.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_output_unittest_.cc
M		googletest/test/gtest_xml_test_utils.py
M		googletest/test/production.cc
M		googletest/test/production.h
M		googletest/xcode/Scripts/versiongenerate.py
V		{ → ci}/travis.sh