Hello Gabe Black, Jason Lowe-Power, Nikos Nikoleris, Ciro Santilli,
I'd like you to reexamine a change. Please visit
https://gem5-review.googlesource.com/c/public/gem5/+/14696
to look at the new patch set (#2).
Change subject: ext: Build googlemock with googletest
......................................................................
ext: Build googlemock with googletest
googlemock needs to be built together with googletest. This patch
is enabling it by doing the following things
* Moving googletest and googlemock under the same top level directory,
so that we have a single SConscript for building them.
This also matches googletest directory structure:
googletest
|_googletest
|_googlemock
* Adding a shared SConscript which is building gmock and gtest as libgtest
* Removing googletest/SConscript
Change-Id: I88accbdd2e80fb47efaa17819233371fbad6acaa
Signed-off-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Reviewed-by: Ciro Santilli <ciro.santi...@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikole...@arm.com>
---
M ext/googletest/SConscript
R ext/googletest/googlemock/CHANGES
R ext/googletest/googlemock/CMakeLists.txt
R ext/googletest/googlemock/CONTRIBUTORS
R ext/googletest/googlemock/LICENSE
R ext/googletest/googlemock/Makefile.am
R ext/googletest/googlemock/README.md
R ext/googletest/googlemock/build-aux/.keep
R ext/googletest/googlemock/configure.ac
R ext/googletest/googlemock/docs/CheatSheet.md
R ext/googletest/googlemock/docs/CookBook.md
R ext/googletest/googlemock/docs/DesignDoc.md
R ext/googletest/googlemock/docs/DevGuide.md
R ext/googletest/googlemock/docs/Documentation.md
R ext/googletest/googlemock/docs/ForDummies.md
R ext/googletest/googlemock/docs/FrequentlyAskedQuestions.md
R ext/googletest/googlemock/docs/KnownIssues.md
R ext/googletest/googlemock/docs/v1_5/CheatSheet.md
R ext/googletest/googlemock/docs/v1_5/CookBook.md
R ext/googletest/googlemock/docs/v1_5/Documentation.md
R ext/googletest/googlemock/docs/v1_5/ForDummies.md
R ext/googletest/googlemock/docs/v1_5/FrequentlyAskedQuestions.md
R ext/googletest/googlemock/docs/v1_6/CheatSheet.md
R ext/googletest/googlemock/docs/v1_6/CookBook.md
R ext/googletest/googlemock/docs/v1_6/Documentation.md
R ext/googletest/googlemock/docs/v1_6/ForDummies.md
R ext/googletest/googlemock/docs/v1_6/FrequentlyAskedQuestions.md
R ext/googletest/googlemock/docs/v1_7/CheatSheet.md
R ext/googletest/googlemock/docs/v1_7/CookBook.md
R ext/googletest/googlemock/docs/v1_7/Documentation.md
R ext/googletest/googlemock/docs/v1_7/ForDummies.md
R ext/googletest/googlemock/docs/v1_7/FrequentlyAskedQuestions.md
R ext/googletest/googlemock/include/gmock/gmock-actions.h
R ext/googletest/googlemock/include/gmock/gmock-cardinalities.h
R ext/googletest/googlemock/include/gmock/gmock-generated-actions.h
R ext/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump
R ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h
R
ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
R ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h
R ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump
R ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h
R ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
R ext/googletest/googlemock/include/gmock/gmock-matchers.h
R ext/googletest/googlemock/include/gmock/gmock-more-actions.h
R ext/googletest/googlemock/include/gmock/gmock-more-matchers.h
R ext/googletest/googlemock/include/gmock/gmock-spec-builders.h
R ext/googletest/googlemock/include/gmock/gmock.h
R
ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
R
ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
R ext/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
R ext/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
R
ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
R
ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
R ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
R ext/googletest/googlemock/include/gmock/internal/gmock-port.h
R ext/googletest/googlemock/make/Makefile
R ext/googletest/googlemock/msvc/2005/gmock.sln
R ext/googletest/googlemock/msvc/2005/gmock.vcproj
R ext/googletest/googlemock/msvc/2005/gmock_config.vsprops
R ext/googletest/googlemock/msvc/2005/gmock_main.vcproj
R ext/googletest/googlemock/msvc/2005/gmock_test.vcproj
R ext/googletest/googlemock/msvc/2010/gmock.sln
R ext/googletest/googlemock/msvc/2010/gmock.vcxproj
R ext/googletest/googlemock/msvc/2010/gmock_config.props
R ext/googletest/googlemock/msvc/2010/gmock_main.vcxproj
R ext/googletest/googlemock/msvc/2010/gmock_test.vcxproj
R ext/googletest/googlemock/msvc/2015/gmock.sln
R ext/googletest/googlemock/msvc/2015/gmock.vcxproj
R ext/googletest/googlemock/msvc/2015/gmock_config.props
R ext/googletest/googlemock/msvc/2015/gmock_main.vcxproj
R ext/googletest/googlemock/msvc/2015/gmock_test.vcxproj
R ext/googletest/googlemock/scripts/fuse_gmock_files.py
R ext/googletest/googlemock/scripts/generator/LICENSE
R ext/googletest/googlemock/scripts/generator/README
R ext/googletest/googlemock/scripts/generator/README.cppclean
R ext/googletest/googlemock/scripts/generator/cpp/__init__.py
R ext/googletest/googlemock/scripts/generator/cpp/ast.py
R ext/googletest/googlemock/scripts/generator/cpp/gmock_class.py
R ext/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
R ext/googletest/googlemock/scripts/generator/cpp/keywords.py
R ext/googletest/googlemock/scripts/generator/cpp/tokenize.py
R ext/googletest/googlemock/scripts/generator/cpp/utils.py
R ext/googletest/googlemock/scripts/generator/gmock_gen.py
R ext/googletest/googlemock/scripts/gmock-config.in
R ext/googletest/googlemock/scripts/gmock_doctor.py
R ext/googletest/googlemock/scripts/upload.py
R ext/googletest/googlemock/scripts/upload_gmock.py
R ext/googletest/googlemock/src/gmock-all.cc
R ext/googletest/googlemock/src/gmock-cardinalities.cc
R ext/googletest/googlemock/src/gmock-internal-utils.cc
R ext/googletest/googlemock/src/gmock-matchers.cc
R ext/googletest/googlemock/src/gmock-spec-builders.cc
R ext/googletest/googlemock/src/gmock.cc
R ext/googletest/googlemock/src/gmock_main.cc
R ext/googletest/googlemock/test/gmock-actions_test.cc
R ext/googletest/googlemock/test/gmock-cardinalities_test.cc
R ext/googletest/googlemock/test/gmock-generated-actions_test.cc
R ext/googletest/googlemock/test/gmock-generated-function-mockers_test.cc
R ext/googletest/googlemock/test/gmock-generated-internal-utils_test.cc
R ext/googletest/googlemock/test/gmock-generated-matchers_test.cc
R ext/googletest/googlemock/test/gmock-internal-utils_test.cc
R ext/googletest/googlemock/test/gmock-matchers_test.cc
R ext/googletest/googlemock/test/gmock-more-actions_test.cc
R ext/googletest/googlemock/test/gmock-nice-strict_test.cc
R ext/googletest/googlemock/test/gmock-port_test.cc
R ext/googletest/googlemock/test/gmock-spec-builders_test.cc
R ext/googletest/googlemock/test/gmock_all_test.cc
R ext/googletest/googlemock/test/gmock_ex_test.cc
R ext/googletest/googlemock/test/gmock_leak_test.py
R ext/googletest/googlemock/test/gmock_leak_test_.cc
R ext/googletest/googlemock/test/gmock_link2_test.cc
R ext/googletest/googlemock/test/gmock_link_test.cc
R ext/googletest/googlemock/test/gmock_link_test.h
R ext/googletest/googlemock/test/gmock_output_test.py
R ext/googletest/googlemock/test/gmock_output_test_.cc
R ext/googletest/googlemock/test/gmock_output_test_golden.txt
R ext/googletest/googlemock/test/gmock_stress_test.cc
R ext/googletest/googlemock/test/gmock_test.cc
R ext/googletest/googlemock/test/gmock_test_utils.py
R ext/googletest/googletest/.gitignore
R ext/googletest/googletest/CHANGES
R ext/googletest/googletest/CMakeLists.txt
R ext/googletest/googletest/CONTRIBUTORS
R ext/googletest/googletest/LICENSE
R ext/googletest/googletest/Makefile.am
R ext/googletest/googletest/README.md
R ext/googletest/googletest/build-aux/.keep
R ext/googletest/googletest/cmake/internal_utils.cmake
R ext/googletest/googletest/codegear/gtest.cbproj
R ext/googletest/googletest/codegear/gtest.groupproj
R ext/googletest/googletest/codegear/gtest_all.cc
R ext/googletest/googletest/codegear/gtest_link.cc
R ext/googletest/googletest/codegear/gtest_main.cbproj
R ext/googletest/googletest/codegear/gtest_unittest.cbproj
R ext/googletest/googletest/configure.ac
R ext/googletest/googletest/docs/AdvancedGuide.md
R ext/googletest/googletest/docs/DevGuide.md
R ext/googletest/googletest/docs/Documentation.md
R ext/googletest/googletest/docs/FAQ.md
R ext/googletest/googletest/docs/Primer.md
R ext/googletest/googletest/docs/PumpManual.md
R ext/googletest/googletest/docs/Samples.md
R ext/googletest/googletest/docs/V1_5_AdvancedGuide.md
R ext/googletest/googletest/docs/V1_5_Documentation.md
R ext/googletest/googletest/docs/V1_5_FAQ.md
R ext/googletest/googletest/docs/V1_5_Primer.md
R ext/googletest/googletest/docs/V1_5_PumpManual.md
R ext/googletest/googletest/docs/V1_5_XcodeGuide.md
R ext/googletest/googletest/docs/V1_6_AdvancedGuide.md
R ext/googletest/googletest/docs/V1_6_Documentation.md
R ext/googletest/googletest/docs/V1_6_FAQ.md
R ext/googletest/googletest/docs/V1_6_Primer.md
R ext/googletest/googletest/docs/V1_6_PumpManual.md
R ext/googletest/googletest/docs/V1_6_Samples.md
R ext/googletest/googletest/docs/V1_6_XcodeGuide.md
R ext/googletest/googletest/docs/V1_7_AdvancedGuide.md
R ext/googletest/googletest/docs/V1_7_Documentation.md
R ext/googletest/googletest/docs/V1_7_FAQ.md
R ext/googletest/googletest/docs/V1_7_Primer.md
R ext/googletest/googletest/docs/V1_7_PumpManual.md
R ext/googletest/googletest/docs/V1_7_Samples.md
R ext/googletest/googletest/docs/V1_7_XcodeGuide.md
R ext/googletest/googletest/docs/XcodeGuide.md
R ext/googletest/googletest/include/gtest/gtest-death-test.h
R ext/googletest/googletest/include/gtest/gtest-message.h
R ext/googletest/googletest/include/gtest/gtest-param-test.h
R ext/googletest/googletest/include/gtest/gtest-param-test.h.pump
R ext/googletest/googletest/include/gtest/gtest-printers.h
R ext/googletest/googletest/include/gtest/gtest-spi.h
R ext/googletest/googletest/include/gtest/gtest-test-part.h
R ext/googletest/googletest/include/gtest/gtest-typed-test.h
R ext/googletest/googletest/include/gtest/gtest.h
R ext/googletest/googletest/include/gtest/gtest_pred_impl.h
R ext/googletest/googletest/include/gtest/gtest_prod.h
R ext/googletest/googletest/include/gtest/internal/custom/gtest-port.h
R ext/googletest/googletest/include/gtest/internal/custom/gtest-printers.h
R ext/googletest/googletest/include/gtest/internal/custom/gtest.h
R
ext/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
R ext/googletest/googletest/include/gtest/internal/gtest-filepath.h
R ext/googletest/googletest/include/gtest/internal/gtest-internal.h
R ext/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h
R
ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h
R
ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
R ext/googletest/googletest/include/gtest/internal/gtest-param-util.h
R ext/googletest/googletest/include/gtest/internal/gtest-port-arch.h
R ext/googletest/googletest/include/gtest/internal/gtest-port.h
R ext/googletest/googletest/include/gtest/internal/gtest-string.h
R ext/googletest/googletest/include/gtest/internal/gtest-tuple.h
R ext/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump
R ext/googletest/googletest/include/gtest/internal/gtest-type-util.h
R ext/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump
R ext/googletest/googletest/m4/acx_pthread.m4
R ext/googletest/googletest/m4/gtest.m4
R ext/googletest/googletest/make/Makefile
R ext/googletest/googletest/msvc/gtest-md.sln
R ext/googletest/googletest/msvc/gtest-md.vcproj
R ext/googletest/googletest/msvc/gtest.sln
R ext/googletest/googletest/msvc/gtest.vcproj
R ext/googletest/googletest/msvc/gtest_main-md.vcproj
R ext/googletest/googletest/msvc/gtest_main.vcproj
R ext/googletest/googletest/msvc/gtest_prod_test-md.vcproj
R ext/googletest/googletest/msvc/gtest_prod_test.vcproj
R ext/googletest/googletest/msvc/gtest_unittest-md.vcproj
R ext/googletest/googletest/msvc/gtest_unittest.vcproj
R ext/googletest/googletest/samples/prime_tables.h
R ext/googletest/googletest/samples/sample1.cc
R ext/googletest/googletest/samples/sample1.h
R ext/googletest/googletest/samples/sample10_unittest.cc
R ext/googletest/googletest/samples/sample1_unittest.cc
R ext/googletest/googletest/samples/sample2.cc
R ext/googletest/googletest/samples/sample2.h
R ext/googletest/googletest/samples/sample2_unittest.cc
R ext/googletest/googletest/samples/sample3-inl.h
R ext/googletest/googletest/samples/sample3_unittest.cc
R ext/googletest/googletest/samples/sample4.cc
R ext/googletest/googletest/samples/sample4.h
R ext/googletest/googletest/samples/sample4_unittest.cc
R ext/googletest/googletest/samples/sample5_unittest.cc
R ext/googletest/googletest/samples/sample6_unittest.cc
R ext/googletest/googletest/samples/sample7_unittest.cc
R ext/googletest/googletest/samples/sample8_unittest.cc
R ext/googletest/googletest/samples/sample9_unittest.cc
R ext/googletest/googletest/scripts/common.py
R ext/googletest/googletest/scripts/fuse_gtest_files.py
R ext/googletest/googletest/scripts/gen_gtest_pred_impl.py
R ext/googletest/googletest/scripts/gtest-config.in
R ext/googletest/googletest/scripts/pump.py
R ext/googletest/googletest/scripts/release_docs.py
R ext/googletest/googletest/scripts/test/Makefile
R ext/googletest/googletest/scripts/upload.py
R ext/googletest/googletest/scripts/upload_gtest.py
R ext/googletest/googletest/src/gtest-all.cc
R ext/googletest/googletest/src/gtest-death-test.cc
R ext/googletest/googletest/src/gtest-filepath.cc
R ext/googletest/googletest/src/gtest-internal-inl.h
R ext/googletest/googletest/src/gtest-port.cc
R ext/googletest/googletest/src/gtest-printers.cc
R ext/googletest/googletest/src/gtest-test-part.cc
R ext/googletest/googletest/src/gtest-typed-test.cc
R ext/googletest/googletest/src/gtest.cc
R ext/googletest/googletest/src/gtest_main.cc
R ext/googletest/googletest/test/gtest-death-test_ex_test.cc
R ext/googletest/googletest/test/gtest-death-test_test.cc
R ext/googletest/googletest/test/gtest-filepath_test.cc
R ext/googletest/googletest/test/gtest-linked_ptr_test.cc
R ext/googletest/googletest/test/gtest-listener_test.cc
R ext/googletest/googletest/test/gtest-message_test.cc
R ext/googletest/googletest/test/gtest-options_test.cc
R ext/googletest/googletest/test/gtest-param-test2_test.cc
R ext/googletest/googletest/test/gtest-param-test_test.cc
R ext/googletest/googletest/test/gtest-param-test_test.h
R ext/googletest/googletest/test/gtest-port_test.cc
R ext/googletest/googletest/test/gtest-printers_test.cc
R ext/googletest/googletest/test/gtest-test-part_test.cc
R ext/googletest/googletest/test/gtest-tuple_test.cc
R ext/googletest/googletest/test/gtest-typed-test2_test.cc
R ext/googletest/googletest/test/gtest-typed-test_test.cc
R ext/googletest/googletest/test/gtest-typed-test_test.h
R ext/googletest/googletest/test/gtest-unittest-api_test.cc
R ext/googletest/googletest/test/gtest_all_test.cc
R ext/googletest/googletest/test/gtest_break_on_failure_unittest.py
R ext/googletest/googletest/test/gtest_break_on_failure_unittest_.cc
R ext/googletest/googletest/test/gtest_catch_exceptions_test.py
R ext/googletest/googletest/test/gtest_catch_exceptions_test_.cc
R ext/googletest/googletest/test/gtest_color_test.py
R ext/googletest/googletest/test/gtest_color_test_.cc
R ext/googletest/googletest/test/gtest_env_var_test.py
R ext/googletest/googletest/test/gtest_env_var_test_.cc
R ext/googletest/googletest/test/gtest_environment_test.cc
R ext/googletest/googletest/test/gtest_filter_unittest.py
R ext/googletest/googletest/test/gtest_filter_unittest_.cc
R ext/googletest/googletest/test/gtest_help_test.py
R ext/googletest/googletest/test/gtest_help_test_.cc
R ext/googletest/googletest/test/gtest_list_tests_unittest.py
R ext/googletest/googletest/test/gtest_list_tests_unittest_.cc
R ext/googletest/googletest/test/gtest_main_unittest.cc
R ext/googletest/googletest/test/gtest_no_test_unittest.cc
R ext/googletest/googletest/test/gtest_output_test.py
R ext/googletest/googletest/test/gtest_output_test_.cc
R ext/googletest/googletest/test/gtest_output_test_golden_lin.txt
R ext/googletest/googletest/test/gtest_pred_impl_unittest.cc
R ext/googletest/googletest/test/gtest_premature_exit_test.cc
R ext/googletest/googletest/test/gtest_prod_test.cc
R ext/googletest/googletest/test/gtest_repeat_test.cc
R ext/googletest/googletest/test/gtest_shuffle_test.py
R ext/googletest/googletest/test/gtest_shuffle_test_.cc
R ext/googletest/googletest/test/gtest_sole_header_test.cc
R ext/googletest/googletest/test/gtest_stress_test.cc
R ext/googletest/googletest/test/gtest_test_utils.py
R ext/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
R ext/googletest/googletest/test/gtest_throw_on_failure_test.py
R ext/googletest/googletest/test/gtest_throw_on_failure_test_.cc
R ext/googletest/googletest/test/gtest_uninitialized_test.py
R ext/googletest/googletest/test/gtest_uninitialized_test_.cc
R ext/googletest/googletest/test/gtest_unittest.cc
R ext/googletest/googletest/test/gtest_xml_outfile1_test_.cc
R ext/googletest/googletest/test/gtest_xml_outfile2_test_.cc
R ext/googletest/googletest/test/gtest_xml_outfiles_test.py
R ext/googletest/googletest/test/gtest_xml_output_unittest.py
R ext/googletest/googletest/test/gtest_xml_output_unittest_.cc
R ext/googletest/googletest/test/gtest_xml_test_utils.py
R ext/googletest/googletest/test/production.cc
R ext/googletest/googletest/test/production.h
R ext/googletest/googletest/xcode/Config/DebugProject.xcconfig
R ext/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig
R ext/googletest/googletest/xcode/Config/General.xcconfig
R ext/googletest/googletest/xcode/Config/ReleaseProject.xcconfig
R ext/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig
R ext/googletest/googletest/xcode/Config/TestTarget.xcconfig
R ext/googletest/googletest/xcode/Resources/Info.plist
R ext/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist
R
ext/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
R ext/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh
R ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc
R ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.h
R ext/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc
R ext/googletest/googletest/xcode/Scripts/runtests.sh
R ext/googletest/googletest/xcode/Scripts/versiongenerate.py
R ext/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj
319 files changed, 14 insertions(+), 10 deletions(-)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/14696
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I88accbdd2e80fb47efaa17819233371fbad6acaa
Gerrit-Change-Number: 14696
Gerrit-PatchSet: 2
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Ciro Santilli <ciro.santi...@arm.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: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-MessageType: newpatchset
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
