Yu-hsin Wang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/65211?usp=email )
Change subject: ext: upgrade to googletest 1.12.0
......................................................................
ext: upgrade to googletest 1.12.0
Upgrade googletest to 1.12.0
upstream commit: 15460959cbbfa20e66ef0b5ab497367e47fc0a04
sha1sum e1e4ab7f4add6d403c37970a83a596b3081077d6 generated by command:
find . -type f ! -name SConscript ! -path "./.*" -print0 \
| sort -z | xargs -0 sha1sum | sha1sum
This upgrade is mainly for solving the infinite-recursion warning from
g++12
ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h: In
function ‘testing::internal::Invalid<gem5::Port&>()gem5::Port&’:
ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h:296:10:
error:
infinite recursion detected [-Werror=infinite-recursion]
296 | inline T Invalid() {
| ^~~~~~~
ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h:301:20:
note:
recursive call
301 | return Invalid<T>();
| ~~~~~~~~~~^~
ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h: In
function ‘testing::internal::Invalid<std::__cxx11::basic_string<char,
std::char_traits<char>, std::allocator<char> >
const&>()std::__cxx11::basic_string<char, std::char_traits<char>,
std::allocator<char> > const&’:
ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h:296:10:
error:
infinite recursion detected [-Werror=infinite-recursion]
296 | inline T Invalid() {
| ^~~~~~~
ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h:301:20:
note:
recursive call
301 | return Invalid<T>();
| ~~~~~~~~~~^~
Change-Id: I14594f7bc148281784043b3f715173316e6d62d4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/65211
Maintainer: Gabe Black <gabebl...@google.com>
Reviewed-by: Gabe Black <gabebl...@google.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M ext/googletest/BUILD.bazel
M ext/googletest/CMakeLists.txt
M ext/googletest/CONTRIBUTING.md
M ext/googletest/CONTRIBUTORS
M ext/googletest/README.md
M ext/googletest/WORKSPACE
M ext/googletest/ci/linux-presubmit.sh
M ext/googletest/docs/advanced.md
M ext/googletest/docs/faq.md
M ext/googletest/docs/gmock_cheat_sheet.md
M ext/googletest/docs/gmock_cook_book.md
M ext/googletest/docs/gmock_faq.md
M ext/googletest/docs/gmock_for_dummies.md
M ext/googletest/docs/primer.md
M ext/googletest/docs/quickstart-bazel.md
M ext/googletest/docs/reference/matchers.md
M ext/googletest/docs/reference/mocking.md
M ext/googletest/docs/reference/testing.md
M ext/googletest/googlemock/CMakeLists.txt
M ext/googletest/googlemock/README.md
M ext/googletest/googlemock/include/gmock/gmock-actions.h
M ext/googletest/googlemock/include/gmock/gmock-cardinalities.h
M ext/googletest/googlemock/include/gmock/gmock-function-mocker.h
M ext/googletest/googlemock/include/gmock/gmock-matchers.h
M ext/googletest/googlemock/include/gmock/gmock-more-actions.h
M ext/googletest/googlemock/include/gmock/gmock-more-matchers.h
M ext/googletest/googlemock/include/gmock/gmock-nice-strict.h
M ext/googletest/googlemock/include/gmock/gmock-spec-builders.h
M ext/googletest/googlemock/include/gmock/gmock.h
M ext/googletest/googlemock/include/gmock/internal/custom/README.md
M
ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
M ext/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
M ext/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
M ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
M ext/googletest/googlemock/include/gmock/internal/gmock-port.h
D ext/googletest/googlemock/scripts/README.md
D ext/googletest/googlemock/scripts/fuse_gmock_files.py
D ext/googletest/googlemock/scripts/generator/LICENSE
D ext/googletest/googlemock/scripts/generator/README
D ext/googletest/googlemock/scripts/generator/README.cppclean
D ext/googletest/googlemock/scripts/generator/cpp/__init__.py
D ext/googletest/googlemock/scripts/generator/cpp/ast.py
D ext/googletest/googlemock/scripts/generator/cpp/gmock_class.py
D ext/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
D ext/googletest/googlemock/scripts/generator/cpp/keywords.py
D ext/googletest/googlemock/scripts/generator/cpp/tokenize.py
D ext/googletest/googlemock/scripts/generator/cpp/utils.py
D ext/googletest/googlemock/scripts/generator/gmock_gen.py
M ext/googletest/googlemock/src/gmock-cardinalities.cc
M ext/googletest/googlemock/src/gmock-internal-utils.cc
M ext/googletest/googlemock/src/gmock-matchers.cc
M ext/googletest/googlemock/src/gmock-spec-builders.cc
M ext/googletest/googlemock/src/gmock.cc
M ext/googletest/googlemock/src/gmock_main.cc
M ext/googletest/googlemock/test/BUILD.bazel
M ext/googletest/googlemock/test/gmock-actions_test.cc
M ext/googletest/googlemock/test/gmock-cardinalities_test.cc
M ext/googletest/googlemock/test/gmock-function-mocker_test.cc
M ext/googletest/googlemock/test/gmock-internal-utils_test.cc
A ext/googletest/googlemock/test/gmock-matchers-arithmetic_test.cc
A ext/googletest/googlemock/test/gmock-matchers-comparisons_test.cc
A ext/googletest/googlemock/test/gmock-matchers-containers_test.cc
A ext/googletest/googlemock/test/gmock-matchers-misc_test.cc
D ext/googletest/googlemock/test/gmock-matchers_test.cc
A ext/googletest/googlemock/test/gmock-matchers_test.h
M ext/googletest/googlemock/test/gmock-more-actions_test.cc
M ext/googletest/googlemock/test/gmock-nice-strict_test.cc
M ext/googletest/googlemock/test/gmock-port_test.cc
M ext/googletest/googlemock/test/gmock-pp-string_test.cc
M ext/googletest/googlemock/test/gmock-spec-builders_test.cc
M ext/googletest/googlemock/test/gmock_all_test.cc
M ext/googletest/googlemock/test/gmock_ex_test.cc
M ext/googletest/googlemock/test/gmock_leak_test.py
M ext/googletest/googlemock/test/gmock_leak_test_.cc
M ext/googletest/googlemock/test/gmock_link2_test.cc
M ext/googletest/googlemock/test/gmock_link_test.cc
M ext/googletest/googlemock/test/gmock_link_test.h
M ext/googletest/googlemock/test/gmock_output_test.py
M ext/googletest/googlemock/test/gmock_output_test_.cc
M ext/googletest/googlemock/test/gmock_output_test_golden.txt
M ext/googletest/googlemock/test/gmock_stress_test.cc
M ext/googletest/googlemock/test/gmock_test.cc
M ext/googletest/googlemock/test/gmock_test_utils.py
M ext/googletest/googletest/CMakeLists.txt
M ext/googletest/googletest/README.md
M ext/googletest/googletest/cmake/internal_utils.cmake
A ext/googletest/googletest/include/gtest/gtest-assertion-result.h
M ext/googletest/googletest/include/gtest/gtest-death-test.h
M ext/googletest/googletest/include/gtest/gtest-matchers.h
M ext/googletest/googletest/include/gtest/gtest-message.h
M ext/googletest/googletest/include/gtest/gtest-param-test.h
M ext/googletest/googletest/include/gtest/gtest-printers.h
M ext/googletest/googletest/include/gtest/gtest-spi.h
M ext/googletest/googletest/include/gtest/gtest-test-part.h
M ext/googletest/googletest/include/gtest/gtest-typed-test.h
M ext/googletest/googletest/include/gtest/gtest.h
M ext/googletest/googletest/include/gtest/gtest_pred_impl.h
M ext/googletest/googletest/include/gtest/gtest_prod.h
M ext/googletest/googletest/include/gtest/internal/custom/README.md
M
ext/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
M ext/googletest/googletest/include/gtest/internal/gtest-filepath.h
M ext/googletest/googletest/include/gtest/internal/gtest-internal.h
M ext/googletest/googletest/include/gtest/internal/gtest-param-util.h
M ext/googletest/googletest/include/gtest/internal/gtest-port-arch.h
M ext/googletest/googletest/include/gtest/internal/gtest-port.h
M ext/googletest/googletest/include/gtest/internal/gtest-string.h
M ext/googletest/googletest/include/gtest/internal/gtest-type-util.h
M ext/googletest/googletest/samples/prime_tables.h
M ext/googletest/googletest/samples/sample1.cc
M ext/googletest/googletest/samples/sample10_unittest.cc
M ext/googletest/googletest/samples/sample1_unittest.cc
M ext/googletest/googletest/samples/sample2.cc
M ext/googletest/googletest/samples/sample2.h
M ext/googletest/googletest/samples/sample2_unittest.cc
M ext/googletest/googletest/samples/sample3-inl.h
M ext/googletest/googletest/samples/sample3_unittest.cc
M ext/googletest/googletest/samples/sample4.cc
M ext/googletest/googletest/samples/sample4_unittest.cc
M ext/googletest/googletest/samples/sample5_unittest.cc
M ext/googletest/googletest/samples/sample6_unittest.cc
M ext/googletest/googletest/samples/sample7_unittest.cc
M ext/googletest/googletest/samples/sample8_unittest.cc
M ext/googletest/googletest/samples/sample9_unittest.cc
D ext/googletest/googletest/scripts/README.md
D ext/googletest/googletest/scripts/common.py
D ext/googletest/googletest/scripts/fuse_gtest_files.py
D ext/googletest/googletest/scripts/gen_gtest_pred_impl.py
D ext/googletest/googletest/scripts/gtest-config.in
D ext/googletest/googletest/scripts/release_docs.py
D ext/googletest/googletest/scripts/run_with_path.py
D ext/googletest/googletest/scripts/test/Makefile
D ext/googletest/googletest/scripts/upload.py
D ext/googletest/googletest/scripts/upload_gtest.py
M ext/googletest/googletest/src/gtest-all.cc
A ext/googletest/googletest/src/gtest-assertion-result.cc
M ext/googletest/googletest/src/gtest-death-test.cc
M ext/googletest/googletest/src/gtest-filepath.cc
M ext/googletest/googletest/src/gtest-internal-inl.h
M ext/googletest/googletest/src/gtest-matchers.cc
M ext/googletest/googletest/src/gtest-port.cc
M ext/googletest/googletest/src/gtest-printers.cc
M ext/googletest/googletest/src/gtest-test-part.cc
M ext/googletest/googletest/src/gtest-typed-test.cc
M ext/googletest/googletest/src/gtest.cc
M ext/googletest/googletest/src/gtest_main.cc
M ext/googletest/googletest/test/BUILD.bazel
M ext/googletest/googletest/test/googletest-break-on-failure-unittest.py
M ext/googletest/googletest/test/googletest-break-on-failure-unittest_.cc
M ext/googletest/googletest/test/googletest-catch-exceptions-test.py
M ext/googletest/googletest/test/googletest-catch-exceptions-test_.cc
M ext/googletest/googletest/test/googletest-color-test.py
M ext/googletest/googletest/test/googletest-color-test_.cc
M ext/googletest/googletest/test/googletest-death-test-test.cc
M ext/googletest/googletest/test/googletest-death-test_ex_test.cc
M ext/googletest/googletest/test/googletest-env-var-test.py
M ext/googletest/googletest/test/googletest-env-var-test_.cc
M ext/googletest/googletest/test/googletest-failfast-unittest.py
M ext/googletest/googletest/test/googletest-failfast-unittest_.cc
M ext/googletest/googletest/test/googletest-filepath-test.cc
M ext/googletest/googletest/test/googletest-filter-unittest.py
M ext/googletest/googletest/test/googletest-filter-unittest_.cc
M ext/googletest/googletest/test/googletest-global-environment-unittest.py
M ext/googletest/googletest/test/googletest-json-outfiles-test.py
M ext/googletest/googletest/test/googletest-json-output-unittest.py
M ext/googletest/googletest/test/googletest-list-tests-unittest.py
M ext/googletest/googletest/test/googletest-list-tests-unittest_.cc
M ext/googletest/googletest/test/googletest-listener-test.cc
M ext/googletest/googletest/test/googletest-message-test.cc
M ext/googletest/googletest/test/googletest-options-test.cc
M ext/googletest/googletest/test/googletest-output-test-golden-lin.txt
M ext/googletest/googletest/test/googletest-output-test.py
M ext/googletest/googletest/test/googletest-output-test_.cc
M ext/googletest/googletest/test/googletest-param-test-invalid-name1-test.py
M
ext/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc
M ext/googletest/googletest/test/googletest-param-test-invalid-name2-test.py
M
ext/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc
M ext/googletest/googletest/test/googletest-param-test-test.cc
M ext/googletest/googletest/test/googletest-param-test-test.h
M ext/googletest/googletest/test/googletest-param-test2-test.cc
M ext/googletest/googletest/test/googletest-port-test.cc
M ext/googletest/googletest/test/googletest-printers-test.cc
M ext/googletest/googletest/test/googletest-setuptestsuite-test.py
M ext/googletest/googletest/test/googletest-setuptestsuite-test_.cc
M ext/googletest/googletest/test/googletest-shuffle-test.py
M ext/googletest/googletest/test/googletest-shuffle-test_.cc
M ext/googletest/googletest/test/googletest-test-part-test.cc
M ext/googletest/googletest/test/googletest-throw-on-failure-test.py
M ext/googletest/googletest/test/googletest-throw-on-failure-test_.cc
M ext/googletest/googletest/test/googletest-uninitialized-test.py
M ext/googletest/googletest/test/googletest-uninitialized-test_.cc
M ext/googletest/googletest/test/gtest-typed-test2_test.cc
M ext/googletest/googletest/test/gtest-typed-test_test.cc
M ext/googletest/googletest/test/gtest-typed-test_test.h
M ext/googletest/googletest/test/gtest-unittest-api_test.cc
M ext/googletest/googletest/test/gtest_assert_by_exception_test.cc
M ext/googletest/googletest/test/gtest_environment_test.cc
M ext/googletest/googletest/test/gtest_help_test.py
M ext/googletest/googletest/test/gtest_help_test_.cc
M ext/googletest/googletest/test/gtest_json_test_utils.py
M ext/googletest/googletest/test/gtest_list_output_unittest.py
M ext/googletest/googletest/test/gtest_main_unittest.cc
M ext/googletest/googletest/test/gtest_pred_impl_unittest.cc
M ext/googletest/googletest/test/gtest_premature_exit_test.cc
M ext/googletest/googletest/test/gtest_repeat_test.cc
M ext/googletest/googletest/test/gtest_skip_check_output_test.py
M ext/googletest/googletest/test/gtest_skip_environment_check_output_test.py
M ext/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc
M ext/googletest/googletest/test/gtest_skip_test.cc
M ext/googletest/googletest/test/gtest_sole_header_test.cc
M ext/googletest/googletest/test/gtest_stress_test.cc
M ext/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc
M ext/googletest/googletest/test/gtest_test_utils.py
M ext/googletest/googletest/test/gtest_testbridge_test.py
M ext/googletest/googletest/test/gtest_testbridge_test_.cc
M ext/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
M ext/googletest/googletest/test/gtest_unittest.cc
M ext/googletest/googletest/test/gtest_xml_outfiles_test.py
M ext/googletest/googletest/test/gtest_xml_output_unittest.py
M ext/googletest/googletest/test/gtest_xml_output_unittest_.cc
M ext/googletest/googletest/test/gtest_xml_test_utils.py
M ext/googletest/googletest/test/production.h
221 files changed, 18,860 insertions(+), 24,275 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/65211?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I14594f7bc148281784043b3f715173316e6d62d4
Gerrit-Change-Number: 65211
Gerrit-PatchSet: 2
Gerrit-Owner: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Earl Ou <shunhsin...@google.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
