Diffusion sp4e-homework-lars-bertil 25905b9f9a45

googletest
25905b9f9a45
Actions

Authored by Gennadiy Civil <misterg@google.com> on Jan 2 2019, 21:49.

Description

Merge branch 'master' of https://github.com/google/googletest

Details

Committed

Gennadiy Civil <misterg@google.com>

Jan 2 2019, 21:49

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:3bedb5a9fc36: Merge pull request #2035 from syohex/update-xcode-project-file
R9484:4665eee10a1d: test, please ignore

Branches

Unknown

Tags

Unknown

Event Timeline

Gennadiy Civil <misterg@google.com> committed R9484:25905b9f9a45: Merge branch 'master' of https://github.com/google/googletest (authored by Gennadiy Civil <misterg@google.com>).Jan 2 2019, 21:49

Merged Changes

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

Commit	Author	Details	Committed
3bedb5a9fc36	Gennadiy Civil/GitHub	Merge pull request #2035 from syohex/update-xcode-project-file	Dec 28 2018
0cf2130c0b59	Syohei YOSHIDA	Update Xcode project file	Dec 28 2018
6729a1361150	Ryohei Machida/Gennadiy Civil	Merge #2002	Dec 27 2018
77004096e850	Gennadiy Civil/GitHub	Update README.md	Dec 27 2018
16269ae2f857	Gennadiy Civil	Merge pull request #2027 from ciband:chore/fix_library_json	Dec 27 2018
c0ef2cbe42df	Chris Johnson/GitHub	fix: Correct GitHub paths	Dec 21 2018
150613166524	Gennadiy Civil/GitHub	Update README.md	Dec 21 2018
4160336cb433	Gennadiy Civil	Merge pull request #2013 from ciband:chore/fix_library_json	Dec 21 2018
34a99e547ab7	Abseil Team/Gennadiy Civil	Googletest export	Dec 21 2018
a83cc11abe48	Abseil Team/Mark Barolak	Googletest export	Dec 20 2018
9494c45e75a5	Abseil Team/Mark Barolak	Googletest export	Dec 20 2018
e26a3fa13ca2	Abseil Team/Mark Barolak	Googletest export	Dec 20 2018
9ab640ce5e51	misterg/Gennadiy Civil	Googletest export	Dec 17 2018
7515e399436a	misterg/Gennadiy Civil	Googletest export	Dec 17 2018
85c4172ed66e	Gennadiy Civil/GitHub	Update README.md	Dec 17 2018
ed3f9bb22960	misterg/Mark Barolak	Googletest export	Dec 17 2018
b7dd66519f4a	Abseil Team/Mark Barolak	Googletest export	Dec 17 2018
1ec20f87e390	Abseil Team/Mark Barolak	Googletest export	Dec 17 2018
096fb37a1976	Abseil Team/Mark Barolak	Googletest export	Dec 17 2018
0f698c830f79	chris	chore: Add .vs to .gitignore for Visual Studio	Dec 15 2018
1496f73cc4c3	chris	fix: correct JSON syntax	Dec 15 2018
b5f5c596a991	Gennadiy Civil	Merge pull request #2000 from ciband:feat/add_support_platformio	Dec 14 2018
c6cb7e033591	Abseil Team/jueminyang	Googletest export	Dec 13 2018
81f00260668d	misterg/jueminyang	Googletest export	Dec 13 2018
3949c403c0ed	Gennadiy Civil/GitHub	Update README.md	Dec 13 2018
6ef591381372	Abseil Team/jueminyang	Googletest export	Dec 12 2018
b545089f5117	Gennadiy Civil/GitHub	Merge pull request #2004 from cotsog/patch-1	Dec 12 2018
3b1f43c2e7a5	Dominic Jodoin/GitHub	Use if statements	Dec 12 2018
fc0f92676865	Dominic Jodoin/GitHub	Don't cache APT packages on OS X/macOS	Dec 12 2018
ea5e941d8470	Dominic Jodoin/GitHub	Change directory ownership earlier	Dec 12 2018
6cbd3753dc19	misterg/Gennadiy Civil	Googletest export	Dec 11 2018
06bb8d4d6dcf	Abseil Team/Gennadiy Civil	Googletest export	Dec 11 2018
b5c08cb9f4f1	Dominic Jodoin/GitHub	Cache gcc and clang APT packages	Dec 10 2018
31eb5e9b873a	Chris Johnson/GitHub	chore: Update version to latest release	Dec 7 2018
d9251df84951	Chris Johnson/GitHub	fix: Remove global chmod from Travis	Dec 6 2018
39c09043b83e	Chris Johnson/GitHub	chore: Add initial library.json config	Dec 6 2018
695cf7c96249	Gennadiy Civil	Merge pull request #1997 from gpakosz:GTEST_IS_THREADSAFE	Dec 5 2018
2c8ab3f18b2e	Chris Johnson/GitHub	feat: Add initial support for PlatformIO and Arduino	Dec 5 2018
fe14e3030737	Gennadiy Civil/GitHub	Merge pull request #1995 from siddhanjay/patch-1	Dec 4 2018
3d71ab4c37de	Abseil Team/Gennadiy Civil	Googletest export	Dec 4 2018
067aa4c28bb1	Gregory Pakosz	Do not define GTEST_IS_THREADSAFE within GTEST_HAS_SEH	Dec 4 2018
3fd66989bb5c	misterg/Gennadiy Civil	Googletest export	Dec 3 2018
214521a1486d	Gennadiy Civil/GitHub	Update WORKSPACE	Dec 3 2018
a28a71ae41fa	Gennadiy Civil/GitHub	Update README.md	Dec 3 2018
10e82d01d94c	Gennadiy Civil/GitHub	Update README.md	Dec 3 2018
ba344cbc405f	misterg/Gennadiy Civil	Googletest export	Dec 3 2018
26743363be8f	Abseil Team/Gennadiy Civil	Googletest export	Dec 3 2018
a42cdf2abdc0	Abseil Team/Gennadiy Civil	Googletest export	Dec 3 2018
775a17631217	Siddhanjay Godre/GitHub	Fixed typo	Dec 3 2018
8fbf9d16a63a	durandal/Gennadiy Civil	Googletest export	Nov 29 2018

Changes (144)

				Path
	M			.gitignore
	M			.travis.yml
	M			BUILD.bazel
	M			CMakeLists.txt
	M			README.md
	M			WORKSPACE
	A			ci/build-platformio.sh
	M			ci/env-osx.sh
	A			ci/install-platformio.sh
	M			googlemock/CMakeLists.txt
	M			googlemock/Makefile.am
	M			googlemock/README.md
	M			googlemock/cmake/gmock.pc.in
	M			googlemock/cmake/gmock_main.pc.in
	M			googlemock/docs/CheatSheet.md
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-cardinalities.h
	A			googlemock/include/gmock/gmock-function-mocker.h
	M			googlemock/include/gmock/gmock-generated-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h.pump
	M			googlemock/include/gmock/gmock-generated-function-mockers.h
	M			googlemock/include/gmock/gmock-generated-function-mockers.h.pump
	M			googlemock/include/gmock/gmock-generated-matchers.h
	M			googlemock/include/gmock/gmock-generated-matchers.h.pump
	D			googlemock/include/gmock/gmock-generated-nice-strict.h
	V			googlemock/include/gmock/{gmock-generated-nice-strict.h.pump → gmock-nice-strict.h}
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-actions.h
	V			googlemock/include/gmock/{gmock-nice-strict.h ← gmock-generated-nice-strict.h.pump}
	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-generated-internal-utils.h.pump
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-port.h
	A			googlemock/include/gmock/internal/gmock-pp.h
	M			googlemock/src/gmock-cardinalities.cc
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/src/gmock_main.cc
	M			googlemock/test/BUILD.bazel
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-cardinalities_test.cc
	A			googlemock/test/gmock-function-mocker_nc.cc
	A			googlemock/test/gmock-function-mocker_nc_test.py
	P			googlemock/test/gmock-function-mocker_test.cc Copied from googlemock/test/gmock-generated-function-mockers_test.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	P			googlemock/test/gmock-generated-function-mockers_test.cc Copied to googlemock/test/gmock-function-mocker_test.cc
	M			googlemock/test/gmock-generated-internal-utils_test.cc
	M			googlemock/test/gmock-generated-matchers_test.cc
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock-more-actions_test.cc
	M			googlemock/test/gmock-nice-strict_test.cc
	A			googlemock/test/gmock-pp-string_test.cc
	A			googlemock/test/gmock-pp_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_link_test.h
	M			googlemock/test/gmock_stress_test.cc
	M			googletest/CMakeLists.txt
	M			googletest/Makefile.am
	M			googletest/README.md
	M			googletest/cmake/gtest.pc.in
	M			googletest/cmake/gtest_main.pc.in
	M			googletest/cmake/internal_utils.cmake
	M			googletest/docs/advanced.md
	A			googletest/include/gtest/gtest-matchers.h
	M			googletest/include/gtest/gtest-message.h
	P			googletest/include/gtest/gtest-param-test.h Copied from googletest/include/gtest/gtest-param-test.h.pump
	P			googletest/include/gtest/gtest-param-test.h.pump Copied to googletest/include/gtest/gtest-param-test.h
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest-spi.h
	M			googletest/include/gtest/gtest-test-part.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/internal/gtest-death-test-internal.h
	M			googletest/include/gtest/internal/gtest-internal.h
	D			googletest/include/gtest/internal/gtest-linked_ptr.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
	D			googletest/include/gtest/internal/gtest-tuple.h
	D			googletest/include/gtest/internal/gtest-tuple.h.pump
	M			googletest/include/gtest/internal/gtest-type-util.h.pump
	M			googletest/make/Makefile
	M			googletest/samples/prime_tables.h
	M			googletest/samples/sample10_unittest.cc
	M			googletest/samples/sample3_unittest.cc
	M			googletest/samples/sample5_unittest.cc
	M			googletest/samples/sample6_unittest.cc
	M			googletest/samples/sample7_unittest.cc
	M			googletest/samples/sample8_unittest.cc
	M			googletest/samples/sample9_unittest.cc
	M			googletest/src/gtest-all.cc
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-filepath.cc
	M			googletest/src/gtest-internal-inl.h
	A			googletest/src/gtest-matchers.cc
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-printers.cc
	M			googletest/src/gtest.cc
	M			googletest/src/gtest_main.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/googletest-catch-exceptions-test_.cc
	M			googletest/test/googletest-death-test-test.cc
	M			googletest/test/googletest-death-test_ex_test.cc
	M			googletest/test/googletest-env-var-test.py
	M			googletest/test/googletest-filepath-test.cc
	M			googletest/test/googletest-filter-unittest.py
	M			googletest/test/googletest-json-output-unittest.py
	D			googletest/test/googletest-linked-ptr-test.cc
	M			googletest/test/googletest-listener-test.cc
	M			googletest/test/googletest-options-test.cc
	M			googletest/test/googletest-output-test-golden-lin.txt
	M			googletest/test/googletest-output-test.py
	M			googletest/test/googletest-output-test_.cc
	M			googletest/test/googletest-param-test-test.cc
	M			googletest/test/googletest-port-test.cc
	M			googletest/test/googletest-printers-test.cc
	M			googletest/test/googletest-shuffle-test_.cc
	M			googletest/test/googletest-test-part-test.cc
	M			googletest/test/googletest-throw-on-failure-test.py
	D			googletest/test/googletest-tuple-test.cc
	M			googletest/test/googletest-uninitialized-test.py
	M			googletest/test/gtest-typed-test_test.cc
	M			googletest/test/gtest-unittest-api_test.cc
	M			googletest/test/gtest_all_test.cc
	M			googletest/test/gtest_environment_test.cc
	M			googletest/test/gtest_pred_impl_unittest.cc
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_skip_test.cc
	M			googletest/test/gtest_stress_test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfile1_test_.cc
	M			googletest/test/gtest_xml_outfile2_test_.cc
	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/xcode/gtest.xcodeproj/project.pbxproj
	A			library.json
	A			platformio.ini