From 202a4c37ee88e47c614a61db5fe0f134f9f6ea1a Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Mon, 3 Dec 2018 11:37:51 +0000 Subject: [PATCH] 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 Reviewed-by: Ciro Santilli Reviewed-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/c/14696 Reviewed-by: Gabe Black Maintainer: Gabe Black --- ext/googletest/SConscript | 27 ++++++++++++------- ext/{ => googletest}/googlemock/CHANGES | 0 .../googlemock/CMakeLists.txt | 0 ext/{ => googletest}/googlemock/CONTRIBUTORS | 0 ext/{ => googletest}/googlemock/LICENSE | 0 ext/{ => googletest}/googlemock/Makefile.am | 0 ext/{ => googletest}/googlemock/README.md | 0 .../googlemock/build-aux/.keep | 0 ext/{ => googletest}/googlemock/configure.ac | 0 .../googlemock/docs/CheatSheet.md | 0 .../googlemock/docs/CookBook.md | 0 .../googlemock/docs/DesignDoc.md | 0 .../googlemock/docs/DevGuide.md | 0 .../googlemock/docs/Documentation.md | 0 .../googlemock/docs/ForDummies.md | 0 .../docs/FrequentlyAskedQuestions.md | 0 .../googlemock/docs/KnownIssues.md | 0 .../googlemock/docs/v1_5/CheatSheet.md | 0 .../googlemock/docs/v1_5/CookBook.md | 0 .../googlemock/docs/v1_5/Documentation.md | 0 .../googlemock/docs/v1_5/ForDummies.md | 0 .../docs/v1_5/FrequentlyAskedQuestions.md | 0 .../googlemock/docs/v1_6/CheatSheet.md | 0 .../googlemock/docs/v1_6/CookBook.md | 0 .../googlemock/docs/v1_6/Documentation.md | 0 .../googlemock/docs/v1_6/ForDummies.md | 0 .../docs/v1_6/FrequentlyAskedQuestions.md | 0 .../googlemock/docs/v1_7/CheatSheet.md | 0 .../googlemock/docs/v1_7/CookBook.md | 0 .../googlemock/docs/v1_7/Documentation.md | 0 .../googlemock/docs/v1_7/ForDummies.md | 0 .../docs/v1_7/FrequentlyAskedQuestions.md | 0 .../googlemock/include/gmock/gmock-actions.h | 0 .../include/gmock/gmock-cardinalities.h | 0 .../include/gmock/gmock-generated-actions.h | 0 .../gmock/gmock-generated-actions.h.pump | 0 .../gmock/gmock-generated-function-mockers.h | 0 .../gmock-generated-function-mockers.h.pump | 0 .../include/gmock/gmock-generated-matchers.h | 0 .../gmock/gmock-generated-matchers.h.pump | 0 .../gmock/gmock-generated-nice-strict.h | 0 .../gmock/gmock-generated-nice-strict.h.pump | 0 .../googlemock/include/gmock/gmock-matchers.h | 0 .../include/gmock/gmock-more-actions.h | 0 .../include/gmock/gmock-more-matchers.h | 0 .../include/gmock/gmock-spec-builders.h | 0 .../googlemock/include/gmock/gmock.h | 0 .../internal/custom/gmock-generated-actions.h | 0 .../custom/gmock-generated-actions.h.pump | 0 .../gmock/internal/custom/gmock-matchers.h | 0 .../gmock/internal/custom/gmock-port.h | 0 .../internal/gmock-generated-internal-utils.h | 0 .../gmock-generated-internal-utils.h.pump | 0 .../gmock/internal/gmock-internal-utils.h | 0 .../include/gmock/internal/gmock-port.h | 0 ext/{ => googletest}/googlemock/make/Makefile | 0 .../googlemock/msvc/2005/gmock.sln | 0 .../googlemock/msvc/2005/gmock.vcproj | 0 .../googlemock/msvc/2005/gmock_config.vsprops | 0 .../googlemock/msvc/2005/gmock_main.vcproj | 0 .../googlemock/msvc/2005/gmock_test.vcproj | 0 .../googlemock/msvc/2010/gmock.sln | 0 .../googlemock/msvc/2010/gmock.vcxproj | 0 .../googlemock/msvc/2010/gmock_config.props | 0 .../googlemock/msvc/2010/gmock_main.vcxproj | 0 .../googlemock/msvc/2010/gmock_test.vcxproj | 0 .../googlemock/msvc/2015/gmock.sln | 0 .../googlemock/msvc/2015/gmock.vcxproj | 0 .../googlemock/msvc/2015/gmock_config.props | 0 .../googlemock/msvc/2015/gmock_main.vcxproj | 0 .../googlemock/msvc/2015/gmock_test.vcxproj | 0 .../googlemock/scripts/fuse_gmock_files.py | 0 .../googlemock/scripts/generator/LICENSE | 0 .../googlemock/scripts/generator/README | 0 .../scripts/generator/README.cppclean | 0 .../scripts/generator/cpp/__init__.py | 0 .../googlemock/scripts/generator/cpp/ast.py | 0 .../scripts/generator/cpp/gmock_class.py | 0 .../scripts/generator/cpp/gmock_class_test.py | 0 .../scripts/generator/cpp/keywords.py | 0 .../scripts/generator/cpp/tokenize.py | 0 .../googlemock/scripts/generator/cpp/utils.py | 0 .../googlemock/scripts/generator/gmock_gen.py | 0 .../googlemock/scripts/gmock-config.in | 0 .../googlemock/scripts/gmock_doctor.py | 0 .../googlemock/scripts/upload.py | 0 .../googlemock/scripts/upload_gmock.py | 0 .../googlemock/src/gmock-all.cc | 0 .../googlemock/src/gmock-cardinalities.cc | 0 .../googlemock/src/gmock-internal-utils.cc | 0 .../googlemock/src/gmock-matchers.cc | 0 .../googlemock/src/gmock-spec-builders.cc | 0 ext/{ => googletest}/googlemock/src/gmock.cc | 0 .../googlemock/src/gmock_main.cc | 0 .../googlemock/test/gmock-actions_test.cc | 0 .../test/gmock-cardinalities_test.cc | 0 .../test/gmock-generated-actions_test.cc | 0 .../gmock-generated-function-mockers_test.cc | 0 .../gmock-generated-internal-utils_test.cc | 0 .../test/gmock-generated-matchers_test.cc | 0 .../test/gmock-internal-utils_test.cc | 0 .../googlemock/test/gmock-matchers_test.cc | 0 .../test/gmock-more-actions_test.cc | 0 .../googlemock/test/gmock-nice-strict_test.cc | 0 .../googlemock/test/gmock-port_test.cc | 0 .../test/gmock-spec-builders_test.cc | 0 .../googlemock/test/gmock_all_test.cc | 0 .../googlemock/test/gmock_ex_test.cc | 0 .../googlemock/test/gmock_leak_test.py | 0 .../googlemock/test/gmock_leak_test_.cc | 0 .../googlemock/test/gmock_link2_test.cc | 0 .../googlemock/test/gmock_link_test.cc | 0 .../googlemock/test/gmock_link_test.h | 0 .../googlemock/test/gmock_output_test.py | 0 .../googlemock/test/gmock_output_test_.cc | 0 .../test/gmock_output_test_golden.txt | 0 .../googlemock/test/gmock_stress_test.cc | 0 .../googlemock/test/gmock_test.cc | 0 .../googlemock/test/gmock_test_utils.py | 0 ext/googletest/{ => googletest}/.gitignore | 0 ext/googletest/{ => googletest}/CHANGES | 0 .../{ => googletest}/CMakeLists.txt | 0 ext/googletest/{ => googletest}/CONTRIBUTORS | 0 ext/googletest/{ => googletest}/LICENSE | 0 ext/googletest/{ => googletest}/Makefile.am | 0 ext/googletest/{ => googletest}/README.md | 0 .../{ => googletest}/build-aux/.keep | 0 .../cmake/internal_utils.cmake | 0 .../{ => googletest}/codegear/gtest.cbproj | 0 .../{ => googletest}/codegear/gtest.groupproj | 0 .../{ => googletest}/codegear/gtest_all.cc | 0 .../{ => googletest}/codegear/gtest_link.cc | 0 .../codegear/gtest_main.cbproj | 0 .../codegear/gtest_unittest.cbproj | 0 ext/googletest/{ => googletest}/configure.ac | 0 .../{ => googletest}/docs/AdvancedGuide.md | 0 .../{ => googletest}/docs/DevGuide.md | 0 .../{ => googletest}/docs/Documentation.md | 0 ext/googletest/{ => googletest}/docs/FAQ.md | 0 .../{ => googletest}/docs/Primer.md | 0 .../{ => googletest}/docs/PumpManual.md | 0 .../{ => googletest}/docs/Samples.md | 0 .../docs/V1_5_AdvancedGuide.md | 0 .../docs/V1_5_Documentation.md | 0 .../{ => googletest}/docs/V1_5_FAQ.md | 0 .../{ => googletest}/docs/V1_5_Primer.md | 0 .../{ => googletest}/docs/V1_5_PumpManual.md | 0 .../{ => googletest}/docs/V1_5_XcodeGuide.md | 0 .../docs/V1_6_AdvancedGuide.md | 0 .../docs/V1_6_Documentation.md | 0 .../{ => googletest}/docs/V1_6_FAQ.md | 0 .../{ => googletest}/docs/V1_6_Primer.md | 0 .../{ => googletest}/docs/V1_6_PumpManual.md | 0 .../{ => googletest}/docs/V1_6_Samples.md | 0 .../{ => googletest}/docs/V1_6_XcodeGuide.md | 0 .../docs/V1_7_AdvancedGuide.md | 0 .../docs/V1_7_Documentation.md | 0 .../{ => googletest}/docs/V1_7_FAQ.md | 0 .../{ => googletest}/docs/V1_7_Primer.md | 0 .../{ => googletest}/docs/V1_7_PumpManual.md | 0 .../{ => googletest}/docs/V1_7_Samples.md | 0 .../{ => googletest}/docs/V1_7_XcodeGuide.md | 0 .../{ => googletest}/docs/XcodeGuide.md | 0 .../include/gtest/gtest-death-test.h | 0 .../include/gtest/gtest-message.h | 0 .../include/gtest/gtest-param-test.h | 0 .../include/gtest/gtest-param-test.h.pump | 0 .../include/gtest/gtest-printers.h | 0 .../include/gtest/gtest-spi.h | 0 .../include/gtest/gtest-test-part.h | 0 .../include/gtest/gtest-typed-test.h | 0 .../{ => googletest}/include/gtest/gtest.h | 0 .../include/gtest/gtest_pred_impl.h | 0 .../include/gtest/gtest_prod.h | 0 .../gtest/internal/custom/gtest-port.h | 0 .../gtest/internal/custom/gtest-printers.h | 0 .../include/gtest/internal/custom/gtest.h | 0 .../internal/gtest-death-test-internal.h | 0 .../include/gtest/internal/gtest-filepath.h | 0 .../include/gtest/internal/gtest-internal.h | 0 .../include/gtest/internal/gtest-linked_ptr.h | 0 .../internal/gtest-param-util-generated.h | 0 .../gtest-param-util-generated.h.pump | 0 .../include/gtest/internal/gtest-param-util.h | 0 .../include/gtest/internal/gtest-port-arch.h | 0 .../include/gtest/internal/gtest-port.h | 0 .../include/gtest/internal/gtest-string.h | 0 .../include/gtest/internal/gtest-tuple.h | 0 .../include/gtest/internal/gtest-tuple.h.pump | 0 .../include/gtest/internal/gtest-type-util.h | 0 .../gtest/internal/gtest-type-util.h.pump | 0 .../{ => googletest}/m4/acx_pthread.m4 | 0 ext/googletest/{ => googletest}/m4/gtest.m4 | 0 ext/googletest/{ => googletest}/make/Makefile | 0 .../{ => googletest}/msvc/gtest-md.sln | 0 .../{ => googletest}/msvc/gtest-md.vcproj | 0 .../{ => googletest}/msvc/gtest.sln | 0 .../{ => googletest}/msvc/gtest.vcproj | 0 .../msvc/gtest_main-md.vcproj | 0 .../{ => googletest}/msvc/gtest_main.vcproj | 0 .../msvc/gtest_prod_test-md.vcproj | 0 .../msvc/gtest_prod_test.vcproj | 0 .../msvc/gtest_unittest-md.vcproj | 0 .../msvc/gtest_unittest.vcproj | 0 .../{ => googletest}/samples/prime_tables.h | 0 .../{ => googletest}/samples/sample1.cc | 0 .../{ => googletest}/samples/sample1.h | 0 .../samples/sample10_unittest.cc | 0 .../samples/sample1_unittest.cc | 0 .../{ => googletest}/samples/sample2.cc | 0 .../{ => googletest}/samples/sample2.h | 0 .../samples/sample2_unittest.cc | 0 .../{ => googletest}/samples/sample3-inl.h | 0 .../samples/sample3_unittest.cc | 0 .../{ => googletest}/samples/sample4.cc | 0 .../{ => googletest}/samples/sample4.h | 0 .../samples/sample4_unittest.cc | 0 .../samples/sample5_unittest.cc | 0 .../samples/sample6_unittest.cc | 0 .../samples/sample7_unittest.cc | 0 .../samples/sample8_unittest.cc | 0 .../samples/sample9_unittest.cc | 0 .../{ => googletest}/scripts/common.py | 0 .../scripts/fuse_gtest_files.py | 0 .../scripts/gen_gtest_pred_impl.py | 0 .../{ => googletest}/scripts/gtest-config.in | 0 .../{ => googletest}/scripts/pump.py | 0 .../{ => googletest}/scripts/release_docs.py | 0 .../{ => googletest}/scripts/test/Makefile | 0 .../{ => googletest}/scripts/upload.py | 0 .../{ => googletest}/scripts/upload_gtest.py | 0 .../{ => googletest}/src/gtest-all.cc | 0 .../{ => googletest}/src/gtest-death-test.cc | 0 .../{ => googletest}/src/gtest-filepath.cc | 0 .../{ => googletest}/src/gtest-internal-inl.h | 0 .../{ => googletest}/src/gtest-port.cc | 0 .../{ => googletest}/src/gtest-printers.cc | 0 .../{ => googletest}/src/gtest-test-part.cc | 0 .../{ => googletest}/src/gtest-typed-test.cc | 0 ext/googletest/{ => googletest}/src/gtest.cc | 0 .../{ => googletest}/src/gtest_main.cc | 0 .../test/gtest-death-test_ex_test.cc | 0 .../test/gtest-death-test_test.cc | 0 .../test/gtest-filepath_test.cc | 0 .../test/gtest-linked_ptr_test.cc | 0 .../test/gtest-listener_test.cc | 0 .../test/gtest-message_test.cc | 0 .../test/gtest-options_test.cc | 0 .../test/gtest-param-test2_test.cc | 0 .../test/gtest-param-test_test.cc | 0 .../test/gtest-param-test_test.h | 0 .../{ => googletest}/test/gtest-port_test.cc | 0 .../test/gtest-printers_test.cc | 0 .../test/gtest-test-part_test.cc | 0 .../{ => googletest}/test/gtest-tuple_test.cc | 0 .../test/gtest-typed-test2_test.cc | 0 .../test/gtest-typed-test_test.cc | 0 .../test/gtest-typed-test_test.h | 0 .../test/gtest-unittest-api_test.cc | 0 .../{ => googletest}/test/gtest_all_test.cc | 0 .../test/gtest_break_on_failure_unittest.py | 0 .../test/gtest_break_on_failure_unittest_.cc | 0 .../test/gtest_catch_exceptions_test.py | 0 .../test/gtest_catch_exceptions_test_.cc | 0 .../{ => googletest}/test/gtest_color_test.py | 0 .../test/gtest_color_test_.cc | 0 .../test/gtest_env_var_test.py | 0 .../test/gtest_env_var_test_.cc | 0 .../test/gtest_environment_test.cc | 0 .../test/gtest_filter_unittest.py | 0 .../test/gtest_filter_unittest_.cc | 0 .../{ => googletest}/test/gtest_help_test.py | 0 .../{ => googletest}/test/gtest_help_test_.cc | 0 .../test/gtest_list_tests_unittest.py | 0 .../test/gtest_list_tests_unittest_.cc | 0 .../test/gtest_main_unittest.cc | 0 .../test/gtest_no_test_unittest.cc | 0 .../test/gtest_output_test.py | 0 .../test/gtest_output_test_.cc | 0 .../test/gtest_output_test_golden_lin.txt | 0 .../test/gtest_pred_impl_unittest.cc | 0 .../test/gtest_premature_exit_test.cc | 0 .../{ => googletest}/test/gtest_prod_test.cc | 0 .../test/gtest_repeat_test.cc | 0 .../test/gtest_shuffle_test.py | 0 .../test/gtest_shuffle_test_.cc | 0 .../test/gtest_sole_header_test.cc | 0 .../test/gtest_stress_test.cc | 0 .../{ => googletest}/test/gtest_test_utils.py | 0 .../test/gtest_throw_on_failure_ex_test.cc | 0 .../test/gtest_throw_on_failure_test.py | 0 .../test/gtest_throw_on_failure_test_.cc | 0 .../test/gtest_uninitialized_test.py | 0 .../test/gtest_uninitialized_test_.cc | 0 .../{ => googletest}/test/gtest_unittest.cc | 0 .../test/gtest_xml_outfile1_test_.cc | 0 .../test/gtest_xml_outfile2_test_.cc | 0 .../test/gtest_xml_outfiles_test.py | 0 .../test/gtest_xml_output_unittest.py | 0 .../test/gtest_xml_output_unittest_.cc | 0 .../test/gtest_xml_test_utils.py | 0 .../{ => googletest}/test/production.cc | 0 .../{ => googletest}/test/production.h | 0 .../xcode/Config/DebugProject.xcconfig | 0 .../xcode/Config/FrameworkTarget.xcconfig | 0 .../xcode/Config/General.xcconfig | 0 .../xcode/Config/ReleaseProject.xcconfig | 0 .../xcode/Config/StaticLibraryTarget.xcconfig | 0 .../xcode/Config/TestTarget.xcconfig | 0 .../xcode/Resources/Info.plist | 0 .../xcode/Samples/FrameworkSample/Info.plist | 0 .../WidgetFramework.xcodeproj/project.pbxproj | 0 .../xcode/Samples/FrameworkSample/runtests.sh | 0 .../xcode/Samples/FrameworkSample/widget.cc | 0 .../xcode/Samples/FrameworkSample/widget.h | 0 .../Samples/FrameworkSample/widget_test.cc | 0 .../xcode/Scripts/runtests.sh | 0 .../xcode/Scripts/versiongenerate.py | 0 .../xcode/gtest.xcodeproj/project.pbxproj | 0 319 files changed, 17 insertions(+), 10 deletions(-) rename ext/{ => googletest}/googlemock/CHANGES (100%) rename ext/{ => googletest}/googlemock/CMakeLists.txt (100%) rename ext/{ => googletest}/googlemock/CONTRIBUTORS (100%) rename ext/{ => googletest}/googlemock/LICENSE (100%) rename ext/{ => googletest}/googlemock/Makefile.am (100%) rename ext/{ => googletest}/googlemock/README.md (100%) rename ext/{ => googletest}/googlemock/build-aux/.keep (100%) rename ext/{ => googletest}/googlemock/configure.ac (100%) rename ext/{ => googletest}/googlemock/docs/CheatSheet.md (100%) rename ext/{ => googletest}/googlemock/docs/CookBook.md (100%) rename ext/{ => googletest}/googlemock/docs/DesignDoc.md (100%) rename ext/{ => googletest}/googlemock/docs/DevGuide.md (100%) rename ext/{ => googletest}/googlemock/docs/Documentation.md (100%) rename ext/{ => googletest}/googlemock/docs/ForDummies.md (100%) rename ext/{ => googletest}/googlemock/docs/FrequentlyAskedQuestions.md (100%) rename ext/{ => googletest}/googlemock/docs/KnownIssues.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_5/CheatSheet.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_5/CookBook.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_5/Documentation.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_5/ForDummies.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_5/FrequentlyAskedQuestions.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_6/CheatSheet.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_6/CookBook.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_6/Documentation.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_6/ForDummies.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_6/FrequentlyAskedQuestions.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_7/CheatSheet.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_7/CookBook.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_7/Documentation.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_7/ForDummies.md (100%) rename ext/{ => googletest}/googlemock/docs/v1_7/FrequentlyAskedQuestions.md (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-actions.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-cardinalities.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-generated-actions.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-generated-actions.h.pump (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-generated-function-mockers.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-generated-function-mockers.h.pump (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-generated-matchers.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-generated-matchers.h.pump (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-generated-nice-strict.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-generated-nice-strict.h.pump (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-matchers.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-more-actions.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-more-matchers.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock-spec-builders.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/gmock.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/internal/custom/gmock-generated-actions.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump (100%) rename ext/{ => googletest}/googlemock/include/gmock/internal/custom/gmock-matchers.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/internal/custom/gmock-port.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/internal/gmock-generated-internal-utils.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump (100%) rename ext/{ => googletest}/googlemock/include/gmock/internal/gmock-internal-utils.h (100%) rename ext/{ => googletest}/googlemock/include/gmock/internal/gmock-port.h (100%) rename ext/{ => googletest}/googlemock/make/Makefile (100%) rename ext/{ => googletest}/googlemock/msvc/2005/gmock.sln (100%) rename ext/{ => googletest}/googlemock/msvc/2005/gmock.vcproj (100%) rename ext/{ => googletest}/googlemock/msvc/2005/gmock_config.vsprops (100%) rename ext/{ => googletest}/googlemock/msvc/2005/gmock_main.vcproj (100%) rename ext/{ => googletest}/googlemock/msvc/2005/gmock_test.vcproj (100%) rename ext/{ => googletest}/googlemock/msvc/2010/gmock.sln (100%) rename ext/{ => googletest}/googlemock/msvc/2010/gmock.vcxproj (100%) rename ext/{ => googletest}/googlemock/msvc/2010/gmock_config.props (100%) rename ext/{ => googletest}/googlemock/msvc/2010/gmock_main.vcxproj (100%) rename ext/{ => googletest}/googlemock/msvc/2010/gmock_test.vcxproj (100%) rename ext/{ => googletest}/googlemock/msvc/2015/gmock.sln (100%) rename ext/{ => googletest}/googlemock/msvc/2015/gmock.vcxproj (100%) rename ext/{ => googletest}/googlemock/msvc/2015/gmock_config.props (100%) rename ext/{ => googletest}/googlemock/msvc/2015/gmock_main.vcxproj (100%) rename ext/{ => googletest}/googlemock/msvc/2015/gmock_test.vcxproj (100%) rename ext/{ => googletest}/googlemock/scripts/fuse_gmock_files.py (100%) rename ext/{ => googletest}/googlemock/scripts/generator/LICENSE (100%) rename ext/{ => googletest}/googlemock/scripts/generator/README (100%) rename ext/{ => googletest}/googlemock/scripts/generator/README.cppclean (100%) rename ext/{ => googletest}/googlemock/scripts/generator/cpp/__init__.py (100%) rename ext/{ => googletest}/googlemock/scripts/generator/cpp/ast.py (100%) rename ext/{ => googletest}/googlemock/scripts/generator/cpp/gmock_class.py (100%) rename ext/{ => googletest}/googlemock/scripts/generator/cpp/gmock_class_test.py (100%) rename ext/{ => googletest}/googlemock/scripts/generator/cpp/keywords.py (100%) rename ext/{ => googletest}/googlemock/scripts/generator/cpp/tokenize.py (100%) rename ext/{ => googletest}/googlemock/scripts/generator/cpp/utils.py (100%) rename ext/{ => googletest}/googlemock/scripts/generator/gmock_gen.py (100%) rename ext/{ => googletest}/googlemock/scripts/gmock-config.in (100%) rename ext/{ => googletest}/googlemock/scripts/gmock_doctor.py (100%) rename ext/{ => googletest}/googlemock/scripts/upload.py (100%) rename ext/{ => googletest}/googlemock/scripts/upload_gmock.py (100%) rename ext/{ => googletest}/googlemock/src/gmock-all.cc (100%) rename ext/{ => googletest}/googlemock/src/gmock-cardinalities.cc (100%) rename ext/{ => googletest}/googlemock/src/gmock-internal-utils.cc (100%) rename ext/{ => googletest}/googlemock/src/gmock-matchers.cc (100%) rename ext/{ => googletest}/googlemock/src/gmock-spec-builders.cc (100%) rename ext/{ => googletest}/googlemock/src/gmock.cc (100%) rename ext/{ => googletest}/googlemock/src/gmock_main.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-actions_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-cardinalities_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-generated-actions_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-generated-function-mockers_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-generated-internal-utils_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-generated-matchers_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-internal-utils_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-matchers_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-more-actions_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-nice-strict_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-port_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock-spec-builders_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_all_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_ex_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_leak_test.py (100%) rename ext/{ => googletest}/googlemock/test/gmock_leak_test_.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_link2_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_link_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_link_test.h (100%) rename ext/{ => googletest}/googlemock/test/gmock_output_test.py (100%) rename ext/{ => googletest}/googlemock/test/gmock_output_test_.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_output_test_golden.txt (100%) rename ext/{ => googletest}/googlemock/test/gmock_stress_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_test.cc (100%) rename ext/{ => googletest}/googlemock/test/gmock_test_utils.py (100%) rename ext/googletest/{ => googletest}/.gitignore (100%) rename ext/googletest/{ => googletest}/CHANGES (100%) rename ext/googletest/{ => googletest}/CMakeLists.txt (100%) rename ext/googletest/{ => googletest}/CONTRIBUTORS (100%) rename ext/googletest/{ => googletest}/LICENSE (100%) rename ext/googletest/{ => googletest}/Makefile.am (100%) rename ext/googletest/{ => googletest}/README.md (100%) rename ext/googletest/{ => googletest}/build-aux/.keep (100%) rename ext/googletest/{ => googletest}/cmake/internal_utils.cmake (100%) rename ext/googletest/{ => googletest}/codegear/gtest.cbproj (100%) rename ext/googletest/{ => googletest}/codegear/gtest.groupproj (100%) rename ext/googletest/{ => googletest}/codegear/gtest_all.cc (100%) rename ext/googletest/{ => googletest}/codegear/gtest_link.cc (100%) rename ext/googletest/{ => googletest}/codegear/gtest_main.cbproj (100%) rename ext/googletest/{ => googletest}/codegear/gtest_unittest.cbproj (100%) rename ext/googletest/{ => googletest}/configure.ac (100%) rename ext/googletest/{ => googletest}/docs/AdvancedGuide.md (100%) rename ext/googletest/{ => googletest}/docs/DevGuide.md (100%) rename ext/googletest/{ => googletest}/docs/Documentation.md (100%) rename ext/googletest/{ => googletest}/docs/FAQ.md (100%) rename ext/googletest/{ => googletest}/docs/Primer.md (100%) rename ext/googletest/{ => googletest}/docs/PumpManual.md (100%) rename ext/googletest/{ => googletest}/docs/Samples.md (100%) rename ext/googletest/{ => googletest}/docs/V1_5_AdvancedGuide.md (100%) rename ext/googletest/{ => googletest}/docs/V1_5_Documentation.md (100%) rename ext/googletest/{ => googletest}/docs/V1_5_FAQ.md (100%) rename ext/googletest/{ => googletest}/docs/V1_5_Primer.md (100%) rename ext/googletest/{ => googletest}/docs/V1_5_PumpManual.md (100%) rename ext/googletest/{ => googletest}/docs/V1_5_XcodeGuide.md (100%) rename ext/googletest/{ => googletest}/docs/V1_6_AdvancedGuide.md (100%) rename ext/googletest/{ => googletest}/docs/V1_6_Documentation.md (100%) rename ext/googletest/{ => googletest}/docs/V1_6_FAQ.md (100%) rename ext/googletest/{ => googletest}/docs/V1_6_Primer.md (100%) rename ext/googletest/{ => googletest}/docs/V1_6_PumpManual.md (100%) rename ext/googletest/{ => googletest}/docs/V1_6_Samples.md (100%) rename ext/googletest/{ => googletest}/docs/V1_6_XcodeGuide.md (100%) rename ext/googletest/{ => googletest}/docs/V1_7_AdvancedGuide.md (100%) rename ext/googletest/{ => googletest}/docs/V1_7_Documentation.md (100%) rename ext/googletest/{ => googletest}/docs/V1_7_FAQ.md (100%) rename ext/googletest/{ => googletest}/docs/V1_7_Primer.md (100%) rename ext/googletest/{ => googletest}/docs/V1_7_PumpManual.md (100%) rename ext/googletest/{ => googletest}/docs/V1_7_Samples.md (100%) rename ext/googletest/{ => googletest}/docs/V1_7_XcodeGuide.md (100%) rename ext/googletest/{ => googletest}/docs/XcodeGuide.md (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest-death-test.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest-message.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest-param-test.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest-param-test.h.pump (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest-printers.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest-spi.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest-test-part.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest-typed-test.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest_pred_impl.h (100%) rename ext/googletest/{ => googletest}/include/gtest/gtest_prod.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/custom/gtest-port.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/custom/gtest-printers.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/custom/gtest.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-death-test-internal.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-filepath.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-internal.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-linked_ptr.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-param-util-generated.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-param-util-generated.h.pump (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-param-util.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-port-arch.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-port.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-string.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-tuple.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-tuple.h.pump (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-type-util.h (100%) rename ext/googletest/{ => googletest}/include/gtest/internal/gtest-type-util.h.pump (100%) rename ext/googletest/{ => googletest}/m4/acx_pthread.m4 (100%) rename ext/googletest/{ => googletest}/m4/gtest.m4 (100%) rename ext/googletest/{ => googletest}/make/Makefile (100%) rename ext/googletest/{ => googletest}/msvc/gtest-md.sln (100%) rename ext/googletest/{ => googletest}/msvc/gtest-md.vcproj (100%) rename ext/googletest/{ => googletest}/msvc/gtest.sln (100%) rename ext/googletest/{ => googletest}/msvc/gtest.vcproj (100%) rename ext/googletest/{ => googletest}/msvc/gtest_main-md.vcproj (100%) rename ext/googletest/{ => googletest}/msvc/gtest_main.vcproj (100%) rename ext/googletest/{ => googletest}/msvc/gtest_prod_test-md.vcproj (100%) rename ext/googletest/{ => googletest}/msvc/gtest_prod_test.vcproj (100%) rename ext/googletest/{ => googletest}/msvc/gtest_unittest-md.vcproj (100%) rename ext/googletest/{ => googletest}/msvc/gtest_unittest.vcproj (100%) rename ext/googletest/{ => googletest}/samples/prime_tables.h (100%) rename ext/googletest/{ => googletest}/samples/sample1.cc (100%) rename ext/googletest/{ => googletest}/samples/sample1.h (100%) rename ext/googletest/{ => googletest}/samples/sample10_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample1_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample2.cc (100%) rename ext/googletest/{ => googletest}/samples/sample2.h (100%) rename ext/googletest/{ => googletest}/samples/sample2_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample3-inl.h (100%) rename ext/googletest/{ => googletest}/samples/sample3_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample4.cc (100%) rename ext/googletest/{ => googletest}/samples/sample4.h (100%) rename ext/googletest/{ => googletest}/samples/sample4_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample5_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample6_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample7_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample8_unittest.cc (100%) rename ext/googletest/{ => googletest}/samples/sample9_unittest.cc (100%) rename ext/googletest/{ => googletest}/scripts/common.py (100%) rename ext/googletest/{ => googletest}/scripts/fuse_gtest_files.py (100%) rename ext/googletest/{ => googletest}/scripts/gen_gtest_pred_impl.py (100%) rename ext/googletest/{ => googletest}/scripts/gtest-config.in (100%) rename ext/googletest/{ => googletest}/scripts/pump.py (100%) rename ext/googletest/{ => googletest}/scripts/release_docs.py (100%) rename ext/googletest/{ => googletest}/scripts/test/Makefile (100%) rename ext/googletest/{ => googletest}/scripts/upload.py (100%) rename ext/googletest/{ => googletest}/scripts/upload_gtest.py (100%) rename ext/googletest/{ => googletest}/src/gtest-all.cc (100%) rename ext/googletest/{ => googletest}/src/gtest-death-test.cc (100%) rename ext/googletest/{ => googletest}/src/gtest-filepath.cc (100%) rename ext/googletest/{ => googletest}/src/gtest-internal-inl.h (100%) rename ext/googletest/{ => googletest}/src/gtest-port.cc (100%) rename ext/googletest/{ => googletest}/src/gtest-printers.cc (100%) rename ext/googletest/{ => googletest}/src/gtest-test-part.cc (100%) rename ext/googletest/{ => googletest}/src/gtest-typed-test.cc (100%) rename ext/googletest/{ => googletest}/src/gtest.cc (100%) rename ext/googletest/{ => googletest}/src/gtest_main.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-death-test_ex_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-death-test_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-filepath_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-linked_ptr_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-listener_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-message_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-options_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-param-test2_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-param-test_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-param-test_test.h (100%) rename ext/googletest/{ => googletest}/test/gtest-port_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-printers_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-test-part_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-tuple_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-typed-test2_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-typed-test_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest-typed-test_test.h (100%) rename ext/googletest/{ => googletest}/test/gtest-unittest-api_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_all_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_break_on_failure_unittest.py (100%) rename ext/googletest/{ => googletest}/test/gtest_break_on_failure_unittest_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_catch_exceptions_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_catch_exceptions_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_color_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_color_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_env_var_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_env_var_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_environment_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_filter_unittest.py (100%) rename ext/googletest/{ => googletest}/test/gtest_filter_unittest_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_help_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_help_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_list_tests_unittest.py (100%) rename ext/googletest/{ => googletest}/test/gtest_list_tests_unittest_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_main_unittest.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_no_test_unittest.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_output_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_output_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_output_test_golden_lin.txt (100%) rename ext/googletest/{ => googletest}/test/gtest_pred_impl_unittest.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_premature_exit_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_prod_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_repeat_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_shuffle_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_shuffle_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_sole_header_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_stress_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_test_utils.py (100%) rename ext/googletest/{ => googletest}/test/gtest_throw_on_failure_ex_test.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_throw_on_failure_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_throw_on_failure_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_uninitialized_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_uninitialized_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_unittest.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_xml_outfile1_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_xml_outfile2_test_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_xml_outfiles_test.py (100%) rename ext/googletest/{ => googletest}/test/gtest_xml_output_unittest.py (100%) rename ext/googletest/{ => googletest}/test/gtest_xml_output_unittest_.cc (100%) rename ext/googletest/{ => googletest}/test/gtest_xml_test_utils.py (100%) rename ext/googletest/{ => googletest}/test/production.cc (100%) rename ext/googletest/{ => googletest}/test/production.h (100%) rename ext/googletest/{ => googletest}/xcode/Config/DebugProject.xcconfig (100%) rename ext/googletest/{ => googletest}/xcode/Config/FrameworkTarget.xcconfig (100%) rename ext/googletest/{ => googletest}/xcode/Config/General.xcconfig (100%) rename ext/googletest/{ => googletest}/xcode/Config/ReleaseProject.xcconfig (100%) rename ext/googletest/{ => googletest}/xcode/Config/StaticLibraryTarget.xcconfig (100%) rename ext/googletest/{ => googletest}/xcode/Config/TestTarget.xcconfig (100%) rename ext/googletest/{ => googletest}/xcode/Resources/Info.plist (100%) rename ext/googletest/{ => googletest}/xcode/Samples/FrameworkSample/Info.plist (100%) rename ext/googletest/{ => googletest}/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj (100%) rename ext/googletest/{ => googletest}/xcode/Samples/FrameworkSample/runtests.sh (100%) rename ext/googletest/{ => googletest}/xcode/Samples/FrameworkSample/widget.cc (100%) rename ext/googletest/{ => googletest}/xcode/Samples/FrameworkSample/widget.h (100%) rename ext/googletest/{ => googletest}/xcode/Samples/FrameworkSample/widget_test.cc (100%) rename ext/googletest/{ => googletest}/xcode/Scripts/runtests.sh (100%) rename ext/googletest/{ => googletest}/xcode/Scripts/versiongenerate.py (100%) rename ext/googletest/{ => googletest}/xcode/gtest.xcodeproj/project.pbxproj (100%) diff --git a/ext/googletest/SConscript b/ext/googletest/SConscript index 27013f265..6792a756c 100644 --- a/ext/googletest/SConscript +++ b/ext/googletest/SConscript @@ -1,5 +1,8 @@ # Copyright 2017 Google Inc. # +# Copyright (c) 2018 ARM Limited +# All rights reserved. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: redistributions of source code must retain the above copyright @@ -28,22 +31,26 @@ Import('main') # The root of the build directory. build = Dir('.') # The root of the original directory. -base = build.srcdir +gtest_base = build.srcdir.Dir('googletest') +gmock_base = build.srcdir.Dir('googlemock') # Include files from the original directory. -include = base.Dir('include') +gtest_include = gtest_base.Dir('include') +gmock_include = gmock_base.Dir('include') # Use source files from the build directory so build products end up there. -src = Dir('src') +gtest_src = Dir('googletest/src') +gmock_src = Dir('googlemock/src') -main.Append(CPPPATH=[include]) +main.Append(CPPPATH=[gtest_include, gmock_include]) main.Append(LIBPATH=[build]) env = main.Clone(CPPFLAGS='-g -Wall -Wextra -pthread' - ' -Wno-undef -isystem %s' % include) -env.Append(CPPPATH=[base]) + ' -Wno-undef -isystem %s -isystem %s' % (gtest_include, gmock_include)) +env.Append(CPPPATH=[gtest_base, gmock_base]) -gtest_all = env.Object(src.File('gtest-all.cc')) +gtest_all = env.Object(gtest_src.File('gtest-all.cc')) +gmock_all = env.Object(gmock_src.File('gmock-all.cc')) gtest_main = env.StaticLibrary( - target='gtest_main', source=[gtest_all, src.File('gtest_main.cc')]) + target='libgtest', source=[gtest_all, gmock_all, gtest_src.File('gtest_main.cc')]) -main['GTEST_LIBS'] = ['gtest_main', 'pthread'] -main['GTEST_CPPFLAGS'] = '-pthread -Wno-undef -isystem %s' % include.abspath +main['GTEST_LIBS'] = ['libgtest', 'pthread'] +main['GTEST_CPPFLAGS'] = '-pthread -DUSE_GMOCK -Wno-undef -isystem %s' % gtest_include.abspath diff --git a/ext/googlemock/CHANGES b/ext/googletest/googlemock/CHANGES similarity index 100% rename from ext/googlemock/CHANGES rename to ext/googletest/googlemock/CHANGES diff --git a/ext/googlemock/CMakeLists.txt b/ext/googletest/googlemock/CMakeLists.txt similarity index 100% rename from ext/googlemock/CMakeLists.txt rename to ext/googletest/googlemock/CMakeLists.txt diff --git a/ext/googlemock/CONTRIBUTORS b/ext/googletest/googlemock/CONTRIBUTORS similarity index 100% rename from ext/googlemock/CONTRIBUTORS rename to ext/googletest/googlemock/CONTRIBUTORS diff --git a/ext/googlemock/LICENSE b/ext/googletest/googlemock/LICENSE similarity index 100% rename from ext/googlemock/LICENSE rename to ext/googletest/googlemock/LICENSE diff --git a/ext/googlemock/Makefile.am b/ext/googletest/googlemock/Makefile.am similarity index 100% rename from ext/googlemock/Makefile.am rename to ext/googletest/googlemock/Makefile.am diff --git a/ext/googlemock/README.md b/ext/googletest/googlemock/README.md similarity index 100% rename from ext/googlemock/README.md rename to ext/googletest/googlemock/README.md diff --git a/ext/googlemock/build-aux/.keep b/ext/googletest/googlemock/build-aux/.keep similarity index 100% rename from ext/googlemock/build-aux/.keep rename to ext/googletest/googlemock/build-aux/.keep diff --git a/ext/googlemock/configure.ac b/ext/googletest/googlemock/configure.ac similarity index 100% rename from ext/googlemock/configure.ac rename to ext/googletest/googlemock/configure.ac diff --git a/ext/googlemock/docs/CheatSheet.md b/ext/googletest/googlemock/docs/CheatSheet.md similarity index 100% rename from ext/googlemock/docs/CheatSheet.md rename to ext/googletest/googlemock/docs/CheatSheet.md diff --git a/ext/googlemock/docs/CookBook.md b/ext/googletest/googlemock/docs/CookBook.md similarity index 100% rename from ext/googlemock/docs/CookBook.md rename to ext/googletest/googlemock/docs/CookBook.md diff --git a/ext/googlemock/docs/DesignDoc.md b/ext/googletest/googlemock/docs/DesignDoc.md similarity index 100% rename from ext/googlemock/docs/DesignDoc.md rename to ext/googletest/googlemock/docs/DesignDoc.md diff --git a/ext/googlemock/docs/DevGuide.md b/ext/googletest/googlemock/docs/DevGuide.md similarity index 100% rename from ext/googlemock/docs/DevGuide.md rename to ext/googletest/googlemock/docs/DevGuide.md diff --git a/ext/googlemock/docs/Documentation.md b/ext/googletest/googlemock/docs/Documentation.md similarity index 100% rename from ext/googlemock/docs/Documentation.md rename to ext/googletest/googlemock/docs/Documentation.md diff --git a/ext/googlemock/docs/ForDummies.md b/ext/googletest/googlemock/docs/ForDummies.md similarity index 100% rename from ext/googlemock/docs/ForDummies.md rename to ext/googletest/googlemock/docs/ForDummies.md diff --git a/ext/googlemock/docs/FrequentlyAskedQuestions.md b/ext/googletest/googlemock/docs/FrequentlyAskedQuestions.md similarity index 100% rename from ext/googlemock/docs/FrequentlyAskedQuestions.md rename to ext/googletest/googlemock/docs/FrequentlyAskedQuestions.md diff --git a/ext/googlemock/docs/KnownIssues.md b/ext/googletest/googlemock/docs/KnownIssues.md similarity index 100% rename from ext/googlemock/docs/KnownIssues.md rename to ext/googletest/googlemock/docs/KnownIssues.md diff --git a/ext/googlemock/docs/v1_5/CheatSheet.md b/ext/googletest/googlemock/docs/v1_5/CheatSheet.md similarity index 100% rename from ext/googlemock/docs/v1_5/CheatSheet.md rename to ext/googletest/googlemock/docs/v1_5/CheatSheet.md diff --git a/ext/googlemock/docs/v1_5/CookBook.md b/ext/googletest/googlemock/docs/v1_5/CookBook.md similarity index 100% rename from ext/googlemock/docs/v1_5/CookBook.md rename to ext/googletest/googlemock/docs/v1_5/CookBook.md diff --git a/ext/googlemock/docs/v1_5/Documentation.md b/ext/googletest/googlemock/docs/v1_5/Documentation.md similarity index 100% rename from ext/googlemock/docs/v1_5/Documentation.md rename to ext/googletest/googlemock/docs/v1_5/Documentation.md diff --git a/ext/googlemock/docs/v1_5/ForDummies.md b/ext/googletest/googlemock/docs/v1_5/ForDummies.md similarity index 100% rename from ext/googlemock/docs/v1_5/ForDummies.md rename to ext/googletest/googlemock/docs/v1_5/ForDummies.md diff --git a/ext/googlemock/docs/v1_5/FrequentlyAskedQuestions.md b/ext/googletest/googlemock/docs/v1_5/FrequentlyAskedQuestions.md similarity index 100% rename from ext/googlemock/docs/v1_5/FrequentlyAskedQuestions.md rename to ext/googletest/googlemock/docs/v1_5/FrequentlyAskedQuestions.md diff --git a/ext/googlemock/docs/v1_6/CheatSheet.md b/ext/googletest/googlemock/docs/v1_6/CheatSheet.md similarity index 100% rename from ext/googlemock/docs/v1_6/CheatSheet.md rename to ext/googletest/googlemock/docs/v1_6/CheatSheet.md diff --git a/ext/googlemock/docs/v1_6/CookBook.md b/ext/googletest/googlemock/docs/v1_6/CookBook.md similarity index 100% rename from ext/googlemock/docs/v1_6/CookBook.md rename to ext/googletest/googlemock/docs/v1_6/CookBook.md diff --git a/ext/googlemock/docs/v1_6/Documentation.md b/ext/googletest/googlemock/docs/v1_6/Documentation.md similarity index 100% rename from ext/googlemock/docs/v1_6/Documentation.md rename to ext/googletest/googlemock/docs/v1_6/Documentation.md diff --git a/ext/googlemock/docs/v1_6/ForDummies.md b/ext/googletest/googlemock/docs/v1_6/ForDummies.md similarity index 100% rename from ext/googlemock/docs/v1_6/ForDummies.md rename to ext/googletest/googlemock/docs/v1_6/ForDummies.md diff --git a/ext/googlemock/docs/v1_6/FrequentlyAskedQuestions.md b/ext/googletest/googlemock/docs/v1_6/FrequentlyAskedQuestions.md similarity index 100% rename from ext/googlemock/docs/v1_6/FrequentlyAskedQuestions.md rename to ext/googletest/googlemock/docs/v1_6/FrequentlyAskedQuestions.md diff --git a/ext/googlemock/docs/v1_7/CheatSheet.md b/ext/googletest/googlemock/docs/v1_7/CheatSheet.md similarity index 100% rename from ext/googlemock/docs/v1_7/CheatSheet.md rename to ext/googletest/googlemock/docs/v1_7/CheatSheet.md diff --git a/ext/googlemock/docs/v1_7/CookBook.md b/ext/googletest/googlemock/docs/v1_7/CookBook.md similarity index 100% rename from ext/googlemock/docs/v1_7/CookBook.md rename to ext/googletest/googlemock/docs/v1_7/CookBook.md diff --git a/ext/googlemock/docs/v1_7/Documentation.md b/ext/googletest/googlemock/docs/v1_7/Documentation.md similarity index 100% rename from ext/googlemock/docs/v1_7/Documentation.md rename to ext/googletest/googlemock/docs/v1_7/Documentation.md diff --git a/ext/googlemock/docs/v1_7/ForDummies.md b/ext/googletest/googlemock/docs/v1_7/ForDummies.md similarity index 100% rename from ext/googlemock/docs/v1_7/ForDummies.md rename to ext/googletest/googlemock/docs/v1_7/ForDummies.md diff --git a/ext/googlemock/docs/v1_7/FrequentlyAskedQuestions.md b/ext/googletest/googlemock/docs/v1_7/FrequentlyAskedQuestions.md similarity index 100% rename from ext/googlemock/docs/v1_7/FrequentlyAskedQuestions.md rename to ext/googletest/googlemock/docs/v1_7/FrequentlyAskedQuestions.md diff --git a/ext/googlemock/include/gmock/gmock-actions.h b/ext/googletest/googlemock/include/gmock/gmock-actions.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-actions.h rename to ext/googletest/googlemock/include/gmock/gmock-actions.h diff --git a/ext/googlemock/include/gmock/gmock-cardinalities.h b/ext/googletest/googlemock/include/gmock/gmock-cardinalities.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-cardinalities.h rename to ext/googletest/googlemock/include/gmock/gmock-cardinalities.h diff --git a/ext/googlemock/include/gmock/gmock-generated-actions.h b/ext/googletest/googlemock/include/gmock/gmock-generated-actions.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-generated-actions.h rename to ext/googletest/googlemock/include/gmock/gmock-generated-actions.h diff --git a/ext/googlemock/include/gmock/gmock-generated-actions.h.pump b/ext/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump similarity index 100% rename from ext/googlemock/include/gmock/gmock-generated-actions.h.pump rename to ext/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump diff --git a/ext/googlemock/include/gmock/gmock-generated-function-mockers.h b/ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-generated-function-mockers.h rename to ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h diff --git a/ext/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump similarity index 100% rename from ext/googlemock/include/gmock/gmock-generated-function-mockers.h.pump rename to ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump diff --git a/ext/googlemock/include/gmock/gmock-generated-matchers.h b/ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-generated-matchers.h rename to ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h diff --git a/ext/googlemock/include/gmock/gmock-generated-matchers.h.pump b/ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump similarity index 100% rename from ext/googlemock/include/gmock/gmock-generated-matchers.h.pump rename to ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump diff --git a/ext/googlemock/include/gmock/gmock-generated-nice-strict.h b/ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-generated-nice-strict.h rename to ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h diff --git a/ext/googlemock/include/gmock/gmock-generated-nice-strict.h.pump b/ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump similarity index 100% rename from ext/googlemock/include/gmock/gmock-generated-nice-strict.h.pump rename to ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump diff --git a/ext/googlemock/include/gmock/gmock-matchers.h b/ext/googletest/googlemock/include/gmock/gmock-matchers.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-matchers.h rename to ext/googletest/googlemock/include/gmock/gmock-matchers.h diff --git a/ext/googlemock/include/gmock/gmock-more-actions.h b/ext/googletest/googlemock/include/gmock/gmock-more-actions.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-more-actions.h rename to ext/googletest/googlemock/include/gmock/gmock-more-actions.h diff --git a/ext/googlemock/include/gmock/gmock-more-matchers.h b/ext/googletest/googlemock/include/gmock/gmock-more-matchers.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-more-matchers.h rename to ext/googletest/googlemock/include/gmock/gmock-more-matchers.h diff --git a/ext/googlemock/include/gmock/gmock-spec-builders.h b/ext/googletest/googlemock/include/gmock/gmock-spec-builders.h similarity index 100% rename from ext/googlemock/include/gmock/gmock-spec-builders.h rename to ext/googletest/googlemock/include/gmock/gmock-spec-builders.h diff --git a/ext/googlemock/include/gmock/gmock.h b/ext/googletest/googlemock/include/gmock/gmock.h similarity index 100% rename from ext/googlemock/include/gmock/gmock.h rename to ext/googletest/googlemock/include/gmock/gmock.h diff --git a/ext/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h similarity index 100% rename from ext/googlemock/include/gmock/internal/custom/gmock-generated-actions.h rename to ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h diff --git a/ext/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump similarity index 100% rename from ext/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump rename to ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump diff --git a/ext/googlemock/include/gmock/internal/custom/gmock-matchers.h b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h similarity index 100% rename from ext/googlemock/include/gmock/internal/custom/gmock-matchers.h rename to ext/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h diff --git a/ext/googlemock/include/gmock/internal/custom/gmock-port.h b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-port.h similarity index 100% rename from ext/googlemock/include/gmock/internal/custom/gmock-port.h rename to ext/googletest/googlemock/include/gmock/internal/custom/gmock-port.h diff --git a/ext/googlemock/include/gmock/internal/gmock-generated-internal-utils.h b/ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h similarity index 100% rename from ext/googlemock/include/gmock/internal/gmock-generated-internal-utils.h rename to ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h diff --git a/ext/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump similarity index 100% rename from ext/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump rename to ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump diff --git a/ext/googlemock/include/gmock/internal/gmock-internal-utils.h b/ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h similarity index 100% rename from ext/googlemock/include/gmock/internal/gmock-internal-utils.h rename to ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h diff --git a/ext/googlemock/include/gmock/internal/gmock-port.h b/ext/googletest/googlemock/include/gmock/internal/gmock-port.h similarity index 100% rename from ext/googlemock/include/gmock/internal/gmock-port.h rename to ext/googletest/googlemock/include/gmock/internal/gmock-port.h diff --git a/ext/googlemock/make/Makefile b/ext/googletest/googlemock/make/Makefile similarity index 100% rename from ext/googlemock/make/Makefile rename to ext/googletest/googlemock/make/Makefile diff --git a/ext/googlemock/msvc/2005/gmock.sln b/ext/googletest/googlemock/msvc/2005/gmock.sln similarity index 100% rename from ext/googlemock/msvc/2005/gmock.sln rename to ext/googletest/googlemock/msvc/2005/gmock.sln diff --git a/ext/googlemock/msvc/2005/gmock.vcproj b/ext/googletest/googlemock/msvc/2005/gmock.vcproj similarity index 100% rename from ext/googlemock/msvc/2005/gmock.vcproj rename to ext/googletest/googlemock/msvc/2005/gmock.vcproj diff --git a/ext/googlemock/msvc/2005/gmock_config.vsprops b/ext/googletest/googlemock/msvc/2005/gmock_config.vsprops similarity index 100% rename from ext/googlemock/msvc/2005/gmock_config.vsprops rename to ext/googletest/googlemock/msvc/2005/gmock_config.vsprops diff --git a/ext/googlemock/msvc/2005/gmock_main.vcproj b/ext/googletest/googlemock/msvc/2005/gmock_main.vcproj similarity index 100% rename from ext/googlemock/msvc/2005/gmock_main.vcproj rename to ext/googletest/googlemock/msvc/2005/gmock_main.vcproj diff --git a/ext/googlemock/msvc/2005/gmock_test.vcproj b/ext/googletest/googlemock/msvc/2005/gmock_test.vcproj similarity index 100% rename from ext/googlemock/msvc/2005/gmock_test.vcproj rename to ext/googletest/googlemock/msvc/2005/gmock_test.vcproj diff --git a/ext/googlemock/msvc/2010/gmock.sln b/ext/googletest/googlemock/msvc/2010/gmock.sln similarity index 100% rename from ext/googlemock/msvc/2010/gmock.sln rename to ext/googletest/googlemock/msvc/2010/gmock.sln diff --git a/ext/googlemock/msvc/2010/gmock.vcxproj b/ext/googletest/googlemock/msvc/2010/gmock.vcxproj similarity index 100% rename from ext/googlemock/msvc/2010/gmock.vcxproj rename to ext/googletest/googlemock/msvc/2010/gmock.vcxproj diff --git a/ext/googlemock/msvc/2010/gmock_config.props b/ext/googletest/googlemock/msvc/2010/gmock_config.props similarity index 100% rename from ext/googlemock/msvc/2010/gmock_config.props rename to ext/googletest/googlemock/msvc/2010/gmock_config.props diff --git a/ext/googlemock/msvc/2010/gmock_main.vcxproj b/ext/googletest/googlemock/msvc/2010/gmock_main.vcxproj similarity index 100% rename from ext/googlemock/msvc/2010/gmock_main.vcxproj rename to ext/googletest/googlemock/msvc/2010/gmock_main.vcxproj diff --git a/ext/googlemock/msvc/2010/gmock_test.vcxproj b/ext/googletest/googlemock/msvc/2010/gmock_test.vcxproj similarity index 100% rename from ext/googlemock/msvc/2010/gmock_test.vcxproj rename to ext/googletest/googlemock/msvc/2010/gmock_test.vcxproj diff --git a/ext/googlemock/msvc/2015/gmock.sln b/ext/googletest/googlemock/msvc/2015/gmock.sln similarity index 100% rename from ext/googlemock/msvc/2015/gmock.sln rename to ext/googletest/googlemock/msvc/2015/gmock.sln diff --git a/ext/googlemock/msvc/2015/gmock.vcxproj b/ext/googletest/googlemock/msvc/2015/gmock.vcxproj similarity index 100% rename from ext/googlemock/msvc/2015/gmock.vcxproj rename to ext/googletest/googlemock/msvc/2015/gmock.vcxproj diff --git a/ext/googlemock/msvc/2015/gmock_config.props b/ext/googletest/googlemock/msvc/2015/gmock_config.props similarity index 100% rename from ext/googlemock/msvc/2015/gmock_config.props rename to ext/googletest/googlemock/msvc/2015/gmock_config.props diff --git a/ext/googlemock/msvc/2015/gmock_main.vcxproj b/ext/googletest/googlemock/msvc/2015/gmock_main.vcxproj similarity index 100% rename from ext/googlemock/msvc/2015/gmock_main.vcxproj rename to ext/googletest/googlemock/msvc/2015/gmock_main.vcxproj diff --git a/ext/googlemock/msvc/2015/gmock_test.vcxproj b/ext/googletest/googlemock/msvc/2015/gmock_test.vcxproj similarity index 100% rename from ext/googlemock/msvc/2015/gmock_test.vcxproj rename to ext/googletest/googlemock/msvc/2015/gmock_test.vcxproj diff --git a/ext/googlemock/scripts/fuse_gmock_files.py b/ext/googletest/googlemock/scripts/fuse_gmock_files.py similarity index 100% rename from ext/googlemock/scripts/fuse_gmock_files.py rename to ext/googletest/googlemock/scripts/fuse_gmock_files.py diff --git a/ext/googlemock/scripts/generator/LICENSE b/ext/googletest/googlemock/scripts/generator/LICENSE similarity index 100% rename from ext/googlemock/scripts/generator/LICENSE rename to ext/googletest/googlemock/scripts/generator/LICENSE diff --git a/ext/googlemock/scripts/generator/README b/ext/googletest/googlemock/scripts/generator/README similarity index 100% rename from ext/googlemock/scripts/generator/README rename to ext/googletest/googlemock/scripts/generator/README diff --git a/ext/googlemock/scripts/generator/README.cppclean b/ext/googletest/googlemock/scripts/generator/README.cppclean similarity index 100% rename from ext/googlemock/scripts/generator/README.cppclean rename to ext/googletest/googlemock/scripts/generator/README.cppclean diff --git a/ext/googlemock/scripts/generator/cpp/__init__.py b/ext/googletest/googlemock/scripts/generator/cpp/__init__.py similarity index 100% rename from ext/googlemock/scripts/generator/cpp/__init__.py rename to ext/googletest/googlemock/scripts/generator/cpp/__init__.py diff --git a/ext/googlemock/scripts/generator/cpp/ast.py b/ext/googletest/googlemock/scripts/generator/cpp/ast.py similarity index 100% rename from ext/googlemock/scripts/generator/cpp/ast.py rename to ext/googletest/googlemock/scripts/generator/cpp/ast.py diff --git a/ext/googlemock/scripts/generator/cpp/gmock_class.py b/ext/googletest/googlemock/scripts/generator/cpp/gmock_class.py similarity index 100% rename from ext/googlemock/scripts/generator/cpp/gmock_class.py rename to ext/googletest/googlemock/scripts/generator/cpp/gmock_class.py diff --git a/ext/googlemock/scripts/generator/cpp/gmock_class_test.py b/ext/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py similarity index 100% rename from ext/googlemock/scripts/generator/cpp/gmock_class_test.py rename to ext/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py diff --git a/ext/googlemock/scripts/generator/cpp/keywords.py b/ext/googletest/googlemock/scripts/generator/cpp/keywords.py similarity index 100% rename from ext/googlemock/scripts/generator/cpp/keywords.py rename to ext/googletest/googlemock/scripts/generator/cpp/keywords.py diff --git a/ext/googlemock/scripts/generator/cpp/tokenize.py b/ext/googletest/googlemock/scripts/generator/cpp/tokenize.py similarity index 100% rename from ext/googlemock/scripts/generator/cpp/tokenize.py rename to ext/googletest/googlemock/scripts/generator/cpp/tokenize.py diff --git a/ext/googlemock/scripts/generator/cpp/utils.py b/ext/googletest/googlemock/scripts/generator/cpp/utils.py similarity index 100% rename from ext/googlemock/scripts/generator/cpp/utils.py rename to ext/googletest/googlemock/scripts/generator/cpp/utils.py diff --git a/ext/googlemock/scripts/generator/gmock_gen.py b/ext/googletest/googlemock/scripts/generator/gmock_gen.py similarity index 100% rename from ext/googlemock/scripts/generator/gmock_gen.py rename to ext/googletest/googlemock/scripts/generator/gmock_gen.py diff --git a/ext/googlemock/scripts/gmock-config.in b/ext/googletest/googlemock/scripts/gmock-config.in similarity index 100% rename from ext/googlemock/scripts/gmock-config.in rename to ext/googletest/googlemock/scripts/gmock-config.in diff --git a/ext/googlemock/scripts/gmock_doctor.py b/ext/googletest/googlemock/scripts/gmock_doctor.py similarity index 100% rename from ext/googlemock/scripts/gmock_doctor.py rename to ext/googletest/googlemock/scripts/gmock_doctor.py diff --git a/ext/googlemock/scripts/upload.py b/ext/googletest/googlemock/scripts/upload.py similarity index 100% rename from ext/googlemock/scripts/upload.py rename to ext/googletest/googlemock/scripts/upload.py diff --git a/ext/googlemock/scripts/upload_gmock.py b/ext/googletest/googlemock/scripts/upload_gmock.py similarity index 100% rename from ext/googlemock/scripts/upload_gmock.py rename to ext/googletest/googlemock/scripts/upload_gmock.py diff --git a/ext/googlemock/src/gmock-all.cc b/ext/googletest/googlemock/src/gmock-all.cc similarity index 100% rename from ext/googlemock/src/gmock-all.cc rename to ext/googletest/googlemock/src/gmock-all.cc diff --git a/ext/googlemock/src/gmock-cardinalities.cc b/ext/googletest/googlemock/src/gmock-cardinalities.cc similarity index 100% rename from ext/googlemock/src/gmock-cardinalities.cc rename to ext/googletest/googlemock/src/gmock-cardinalities.cc diff --git a/ext/googlemock/src/gmock-internal-utils.cc b/ext/googletest/googlemock/src/gmock-internal-utils.cc similarity index 100% rename from ext/googlemock/src/gmock-internal-utils.cc rename to ext/googletest/googlemock/src/gmock-internal-utils.cc diff --git a/ext/googlemock/src/gmock-matchers.cc b/ext/googletest/googlemock/src/gmock-matchers.cc similarity index 100% rename from ext/googlemock/src/gmock-matchers.cc rename to ext/googletest/googlemock/src/gmock-matchers.cc diff --git a/ext/googlemock/src/gmock-spec-builders.cc b/ext/googletest/googlemock/src/gmock-spec-builders.cc similarity index 100% rename from ext/googlemock/src/gmock-spec-builders.cc rename to ext/googletest/googlemock/src/gmock-spec-builders.cc diff --git a/ext/googlemock/src/gmock.cc b/ext/googletest/googlemock/src/gmock.cc similarity index 100% rename from ext/googlemock/src/gmock.cc rename to ext/googletest/googlemock/src/gmock.cc diff --git a/ext/googlemock/src/gmock_main.cc b/ext/googletest/googlemock/src/gmock_main.cc similarity index 100% rename from ext/googlemock/src/gmock_main.cc rename to ext/googletest/googlemock/src/gmock_main.cc diff --git a/ext/googlemock/test/gmock-actions_test.cc b/ext/googletest/googlemock/test/gmock-actions_test.cc similarity index 100% rename from ext/googlemock/test/gmock-actions_test.cc rename to ext/googletest/googlemock/test/gmock-actions_test.cc diff --git a/ext/googlemock/test/gmock-cardinalities_test.cc b/ext/googletest/googlemock/test/gmock-cardinalities_test.cc similarity index 100% rename from ext/googlemock/test/gmock-cardinalities_test.cc rename to ext/googletest/googlemock/test/gmock-cardinalities_test.cc diff --git a/ext/googlemock/test/gmock-generated-actions_test.cc b/ext/googletest/googlemock/test/gmock-generated-actions_test.cc similarity index 100% rename from ext/googlemock/test/gmock-generated-actions_test.cc rename to ext/googletest/googlemock/test/gmock-generated-actions_test.cc diff --git a/ext/googlemock/test/gmock-generated-function-mockers_test.cc b/ext/googletest/googlemock/test/gmock-generated-function-mockers_test.cc similarity index 100% rename from ext/googlemock/test/gmock-generated-function-mockers_test.cc rename to ext/googletest/googlemock/test/gmock-generated-function-mockers_test.cc diff --git a/ext/googlemock/test/gmock-generated-internal-utils_test.cc b/ext/googletest/googlemock/test/gmock-generated-internal-utils_test.cc similarity index 100% rename from ext/googlemock/test/gmock-generated-internal-utils_test.cc rename to ext/googletest/googlemock/test/gmock-generated-internal-utils_test.cc diff --git a/ext/googlemock/test/gmock-generated-matchers_test.cc b/ext/googletest/googlemock/test/gmock-generated-matchers_test.cc similarity index 100% rename from ext/googlemock/test/gmock-generated-matchers_test.cc rename to ext/googletest/googlemock/test/gmock-generated-matchers_test.cc diff --git a/ext/googlemock/test/gmock-internal-utils_test.cc b/ext/googletest/googlemock/test/gmock-internal-utils_test.cc similarity index 100% rename from ext/googlemock/test/gmock-internal-utils_test.cc rename to ext/googletest/googlemock/test/gmock-internal-utils_test.cc diff --git a/ext/googlemock/test/gmock-matchers_test.cc b/ext/googletest/googlemock/test/gmock-matchers_test.cc similarity index 100% rename from ext/googlemock/test/gmock-matchers_test.cc rename to ext/googletest/googlemock/test/gmock-matchers_test.cc diff --git a/ext/googlemock/test/gmock-more-actions_test.cc b/ext/googletest/googlemock/test/gmock-more-actions_test.cc similarity index 100% rename from ext/googlemock/test/gmock-more-actions_test.cc rename to ext/googletest/googlemock/test/gmock-more-actions_test.cc diff --git a/ext/googlemock/test/gmock-nice-strict_test.cc b/ext/googletest/googlemock/test/gmock-nice-strict_test.cc similarity index 100% rename from ext/googlemock/test/gmock-nice-strict_test.cc rename to ext/googletest/googlemock/test/gmock-nice-strict_test.cc diff --git a/ext/googlemock/test/gmock-port_test.cc b/ext/googletest/googlemock/test/gmock-port_test.cc similarity index 100% rename from ext/googlemock/test/gmock-port_test.cc rename to ext/googletest/googlemock/test/gmock-port_test.cc diff --git a/ext/googlemock/test/gmock-spec-builders_test.cc b/ext/googletest/googlemock/test/gmock-spec-builders_test.cc similarity index 100% rename from ext/googlemock/test/gmock-spec-builders_test.cc rename to ext/googletest/googlemock/test/gmock-spec-builders_test.cc diff --git a/ext/googlemock/test/gmock_all_test.cc b/ext/googletest/googlemock/test/gmock_all_test.cc similarity index 100% rename from ext/googlemock/test/gmock_all_test.cc rename to ext/googletest/googlemock/test/gmock_all_test.cc diff --git a/ext/googlemock/test/gmock_ex_test.cc b/ext/googletest/googlemock/test/gmock_ex_test.cc similarity index 100% rename from ext/googlemock/test/gmock_ex_test.cc rename to ext/googletest/googlemock/test/gmock_ex_test.cc diff --git a/ext/googlemock/test/gmock_leak_test.py b/ext/googletest/googlemock/test/gmock_leak_test.py similarity index 100% rename from ext/googlemock/test/gmock_leak_test.py rename to ext/googletest/googlemock/test/gmock_leak_test.py diff --git a/ext/googlemock/test/gmock_leak_test_.cc b/ext/googletest/googlemock/test/gmock_leak_test_.cc similarity index 100% rename from ext/googlemock/test/gmock_leak_test_.cc rename to ext/googletest/googlemock/test/gmock_leak_test_.cc diff --git a/ext/googlemock/test/gmock_link2_test.cc b/ext/googletest/googlemock/test/gmock_link2_test.cc similarity index 100% rename from ext/googlemock/test/gmock_link2_test.cc rename to ext/googletest/googlemock/test/gmock_link2_test.cc diff --git a/ext/googlemock/test/gmock_link_test.cc b/ext/googletest/googlemock/test/gmock_link_test.cc similarity index 100% rename from ext/googlemock/test/gmock_link_test.cc rename to ext/googletest/googlemock/test/gmock_link_test.cc diff --git a/ext/googlemock/test/gmock_link_test.h b/ext/googletest/googlemock/test/gmock_link_test.h similarity index 100% rename from ext/googlemock/test/gmock_link_test.h rename to ext/googletest/googlemock/test/gmock_link_test.h diff --git a/ext/googlemock/test/gmock_output_test.py b/ext/googletest/googlemock/test/gmock_output_test.py similarity index 100% rename from ext/googlemock/test/gmock_output_test.py rename to ext/googletest/googlemock/test/gmock_output_test.py diff --git a/ext/googlemock/test/gmock_output_test_.cc b/ext/googletest/googlemock/test/gmock_output_test_.cc similarity index 100% rename from ext/googlemock/test/gmock_output_test_.cc rename to ext/googletest/googlemock/test/gmock_output_test_.cc diff --git a/ext/googlemock/test/gmock_output_test_golden.txt b/ext/googletest/googlemock/test/gmock_output_test_golden.txt similarity index 100% rename from ext/googlemock/test/gmock_output_test_golden.txt rename to ext/googletest/googlemock/test/gmock_output_test_golden.txt diff --git a/ext/googlemock/test/gmock_stress_test.cc b/ext/googletest/googlemock/test/gmock_stress_test.cc similarity index 100% rename from ext/googlemock/test/gmock_stress_test.cc rename to ext/googletest/googlemock/test/gmock_stress_test.cc diff --git a/ext/googlemock/test/gmock_test.cc b/ext/googletest/googlemock/test/gmock_test.cc similarity index 100% rename from ext/googlemock/test/gmock_test.cc rename to ext/googletest/googlemock/test/gmock_test.cc diff --git a/ext/googlemock/test/gmock_test_utils.py b/ext/googletest/googlemock/test/gmock_test_utils.py similarity index 100% rename from ext/googlemock/test/gmock_test_utils.py rename to ext/googletest/googlemock/test/gmock_test_utils.py diff --git a/ext/googletest/.gitignore b/ext/googletest/googletest/.gitignore similarity index 100% rename from ext/googletest/.gitignore rename to ext/googletest/googletest/.gitignore diff --git a/ext/googletest/CHANGES b/ext/googletest/googletest/CHANGES similarity index 100% rename from ext/googletest/CHANGES rename to ext/googletest/googletest/CHANGES diff --git a/ext/googletest/CMakeLists.txt b/ext/googletest/googletest/CMakeLists.txt similarity index 100% rename from ext/googletest/CMakeLists.txt rename to ext/googletest/googletest/CMakeLists.txt diff --git a/ext/googletest/CONTRIBUTORS b/ext/googletest/googletest/CONTRIBUTORS similarity index 100% rename from ext/googletest/CONTRIBUTORS rename to ext/googletest/googletest/CONTRIBUTORS diff --git a/ext/googletest/LICENSE b/ext/googletest/googletest/LICENSE similarity index 100% rename from ext/googletest/LICENSE rename to ext/googletest/googletest/LICENSE diff --git a/ext/googletest/Makefile.am b/ext/googletest/googletest/Makefile.am similarity index 100% rename from ext/googletest/Makefile.am rename to ext/googletest/googletest/Makefile.am diff --git a/ext/googletest/README.md b/ext/googletest/googletest/README.md similarity index 100% rename from ext/googletest/README.md rename to ext/googletest/googletest/README.md diff --git a/ext/googletest/build-aux/.keep b/ext/googletest/googletest/build-aux/.keep similarity index 100% rename from ext/googletest/build-aux/.keep rename to ext/googletest/googletest/build-aux/.keep diff --git a/ext/googletest/cmake/internal_utils.cmake b/ext/googletest/googletest/cmake/internal_utils.cmake similarity index 100% rename from ext/googletest/cmake/internal_utils.cmake rename to ext/googletest/googletest/cmake/internal_utils.cmake diff --git a/ext/googletest/codegear/gtest.cbproj b/ext/googletest/googletest/codegear/gtest.cbproj similarity index 100% rename from ext/googletest/codegear/gtest.cbproj rename to ext/googletest/googletest/codegear/gtest.cbproj diff --git a/ext/googletest/codegear/gtest.groupproj b/ext/googletest/googletest/codegear/gtest.groupproj similarity index 100% rename from ext/googletest/codegear/gtest.groupproj rename to ext/googletest/googletest/codegear/gtest.groupproj diff --git a/ext/googletest/codegear/gtest_all.cc b/ext/googletest/googletest/codegear/gtest_all.cc similarity index 100% rename from ext/googletest/codegear/gtest_all.cc rename to ext/googletest/googletest/codegear/gtest_all.cc diff --git a/ext/googletest/codegear/gtest_link.cc b/ext/googletest/googletest/codegear/gtest_link.cc similarity index 100% rename from ext/googletest/codegear/gtest_link.cc rename to ext/googletest/googletest/codegear/gtest_link.cc diff --git a/ext/googletest/codegear/gtest_main.cbproj b/ext/googletest/googletest/codegear/gtest_main.cbproj similarity index 100% rename from ext/googletest/codegear/gtest_main.cbproj rename to ext/googletest/googletest/codegear/gtest_main.cbproj diff --git a/ext/googletest/codegear/gtest_unittest.cbproj b/ext/googletest/googletest/codegear/gtest_unittest.cbproj similarity index 100% rename from ext/googletest/codegear/gtest_unittest.cbproj rename to ext/googletest/googletest/codegear/gtest_unittest.cbproj diff --git a/ext/googletest/configure.ac b/ext/googletest/googletest/configure.ac similarity index 100% rename from ext/googletest/configure.ac rename to ext/googletest/googletest/configure.ac diff --git a/ext/googletest/docs/AdvancedGuide.md b/ext/googletest/googletest/docs/AdvancedGuide.md similarity index 100% rename from ext/googletest/docs/AdvancedGuide.md rename to ext/googletest/googletest/docs/AdvancedGuide.md diff --git a/ext/googletest/docs/DevGuide.md b/ext/googletest/googletest/docs/DevGuide.md similarity index 100% rename from ext/googletest/docs/DevGuide.md rename to ext/googletest/googletest/docs/DevGuide.md diff --git a/ext/googletest/docs/Documentation.md b/ext/googletest/googletest/docs/Documentation.md similarity index 100% rename from ext/googletest/docs/Documentation.md rename to ext/googletest/googletest/docs/Documentation.md diff --git a/ext/googletest/docs/FAQ.md b/ext/googletest/googletest/docs/FAQ.md similarity index 100% rename from ext/googletest/docs/FAQ.md rename to ext/googletest/googletest/docs/FAQ.md diff --git a/ext/googletest/docs/Primer.md b/ext/googletest/googletest/docs/Primer.md similarity index 100% rename from ext/googletest/docs/Primer.md rename to ext/googletest/googletest/docs/Primer.md diff --git a/ext/googletest/docs/PumpManual.md b/ext/googletest/googletest/docs/PumpManual.md similarity index 100% rename from ext/googletest/docs/PumpManual.md rename to ext/googletest/googletest/docs/PumpManual.md diff --git a/ext/googletest/docs/Samples.md b/ext/googletest/googletest/docs/Samples.md similarity index 100% rename from ext/googletest/docs/Samples.md rename to ext/googletest/googletest/docs/Samples.md diff --git a/ext/googletest/docs/V1_5_AdvancedGuide.md b/ext/googletest/googletest/docs/V1_5_AdvancedGuide.md similarity index 100% rename from ext/googletest/docs/V1_5_AdvancedGuide.md rename to ext/googletest/googletest/docs/V1_5_AdvancedGuide.md diff --git a/ext/googletest/docs/V1_5_Documentation.md b/ext/googletest/googletest/docs/V1_5_Documentation.md similarity index 100% rename from ext/googletest/docs/V1_5_Documentation.md rename to ext/googletest/googletest/docs/V1_5_Documentation.md diff --git a/ext/googletest/docs/V1_5_FAQ.md b/ext/googletest/googletest/docs/V1_5_FAQ.md similarity index 100% rename from ext/googletest/docs/V1_5_FAQ.md rename to ext/googletest/googletest/docs/V1_5_FAQ.md diff --git a/ext/googletest/docs/V1_5_Primer.md b/ext/googletest/googletest/docs/V1_5_Primer.md similarity index 100% rename from ext/googletest/docs/V1_5_Primer.md rename to ext/googletest/googletest/docs/V1_5_Primer.md diff --git a/ext/googletest/docs/V1_5_PumpManual.md b/ext/googletest/googletest/docs/V1_5_PumpManual.md similarity index 100% rename from ext/googletest/docs/V1_5_PumpManual.md rename to ext/googletest/googletest/docs/V1_5_PumpManual.md diff --git a/ext/googletest/docs/V1_5_XcodeGuide.md b/ext/googletest/googletest/docs/V1_5_XcodeGuide.md similarity index 100% rename from ext/googletest/docs/V1_5_XcodeGuide.md rename to ext/googletest/googletest/docs/V1_5_XcodeGuide.md diff --git a/ext/googletest/docs/V1_6_AdvancedGuide.md b/ext/googletest/googletest/docs/V1_6_AdvancedGuide.md similarity index 100% rename from ext/googletest/docs/V1_6_AdvancedGuide.md rename to ext/googletest/googletest/docs/V1_6_AdvancedGuide.md diff --git a/ext/googletest/docs/V1_6_Documentation.md b/ext/googletest/googletest/docs/V1_6_Documentation.md similarity index 100% rename from ext/googletest/docs/V1_6_Documentation.md rename to ext/googletest/googletest/docs/V1_6_Documentation.md diff --git a/ext/googletest/docs/V1_6_FAQ.md b/ext/googletest/googletest/docs/V1_6_FAQ.md similarity index 100% rename from ext/googletest/docs/V1_6_FAQ.md rename to ext/googletest/googletest/docs/V1_6_FAQ.md diff --git a/ext/googletest/docs/V1_6_Primer.md b/ext/googletest/googletest/docs/V1_6_Primer.md similarity index 100% rename from ext/googletest/docs/V1_6_Primer.md rename to ext/googletest/googletest/docs/V1_6_Primer.md diff --git a/ext/googletest/docs/V1_6_PumpManual.md b/ext/googletest/googletest/docs/V1_6_PumpManual.md similarity index 100% rename from ext/googletest/docs/V1_6_PumpManual.md rename to ext/googletest/googletest/docs/V1_6_PumpManual.md diff --git a/ext/googletest/docs/V1_6_Samples.md b/ext/googletest/googletest/docs/V1_6_Samples.md similarity index 100% rename from ext/googletest/docs/V1_6_Samples.md rename to ext/googletest/googletest/docs/V1_6_Samples.md diff --git a/ext/googletest/docs/V1_6_XcodeGuide.md b/ext/googletest/googletest/docs/V1_6_XcodeGuide.md similarity index 100% rename from ext/googletest/docs/V1_6_XcodeGuide.md rename to ext/googletest/googletest/docs/V1_6_XcodeGuide.md diff --git a/ext/googletest/docs/V1_7_AdvancedGuide.md b/ext/googletest/googletest/docs/V1_7_AdvancedGuide.md similarity index 100% rename from ext/googletest/docs/V1_7_AdvancedGuide.md rename to ext/googletest/googletest/docs/V1_7_AdvancedGuide.md diff --git a/ext/googletest/docs/V1_7_Documentation.md b/ext/googletest/googletest/docs/V1_7_Documentation.md similarity index 100% rename from ext/googletest/docs/V1_7_Documentation.md rename to ext/googletest/googletest/docs/V1_7_Documentation.md diff --git a/ext/googletest/docs/V1_7_FAQ.md b/ext/googletest/googletest/docs/V1_7_FAQ.md similarity index 100% rename from ext/googletest/docs/V1_7_FAQ.md rename to ext/googletest/googletest/docs/V1_7_FAQ.md diff --git a/ext/googletest/docs/V1_7_Primer.md b/ext/googletest/googletest/docs/V1_7_Primer.md similarity index 100% rename from ext/googletest/docs/V1_7_Primer.md rename to ext/googletest/googletest/docs/V1_7_Primer.md diff --git a/ext/googletest/docs/V1_7_PumpManual.md b/ext/googletest/googletest/docs/V1_7_PumpManual.md similarity index 100% rename from ext/googletest/docs/V1_7_PumpManual.md rename to ext/googletest/googletest/docs/V1_7_PumpManual.md diff --git a/ext/googletest/docs/V1_7_Samples.md b/ext/googletest/googletest/docs/V1_7_Samples.md similarity index 100% rename from ext/googletest/docs/V1_7_Samples.md rename to ext/googletest/googletest/docs/V1_7_Samples.md diff --git a/ext/googletest/docs/V1_7_XcodeGuide.md b/ext/googletest/googletest/docs/V1_7_XcodeGuide.md similarity index 100% rename from ext/googletest/docs/V1_7_XcodeGuide.md rename to ext/googletest/googletest/docs/V1_7_XcodeGuide.md diff --git a/ext/googletest/docs/XcodeGuide.md b/ext/googletest/googletest/docs/XcodeGuide.md similarity index 100% rename from ext/googletest/docs/XcodeGuide.md rename to ext/googletest/googletest/docs/XcodeGuide.md diff --git a/ext/googletest/include/gtest/gtest-death-test.h b/ext/googletest/googletest/include/gtest/gtest-death-test.h similarity index 100% rename from ext/googletest/include/gtest/gtest-death-test.h rename to ext/googletest/googletest/include/gtest/gtest-death-test.h diff --git a/ext/googletest/include/gtest/gtest-message.h b/ext/googletest/googletest/include/gtest/gtest-message.h similarity index 100% rename from ext/googletest/include/gtest/gtest-message.h rename to ext/googletest/googletest/include/gtest/gtest-message.h diff --git a/ext/googletest/include/gtest/gtest-param-test.h b/ext/googletest/googletest/include/gtest/gtest-param-test.h similarity index 100% rename from ext/googletest/include/gtest/gtest-param-test.h rename to ext/googletest/googletest/include/gtest/gtest-param-test.h diff --git a/ext/googletest/include/gtest/gtest-param-test.h.pump b/ext/googletest/googletest/include/gtest/gtest-param-test.h.pump similarity index 100% rename from ext/googletest/include/gtest/gtest-param-test.h.pump rename to ext/googletest/googletest/include/gtest/gtest-param-test.h.pump diff --git a/ext/googletest/include/gtest/gtest-printers.h b/ext/googletest/googletest/include/gtest/gtest-printers.h similarity index 100% rename from ext/googletest/include/gtest/gtest-printers.h rename to ext/googletest/googletest/include/gtest/gtest-printers.h diff --git a/ext/googletest/include/gtest/gtest-spi.h b/ext/googletest/googletest/include/gtest/gtest-spi.h similarity index 100% rename from ext/googletest/include/gtest/gtest-spi.h rename to ext/googletest/googletest/include/gtest/gtest-spi.h diff --git a/ext/googletest/include/gtest/gtest-test-part.h b/ext/googletest/googletest/include/gtest/gtest-test-part.h similarity index 100% rename from ext/googletest/include/gtest/gtest-test-part.h rename to ext/googletest/googletest/include/gtest/gtest-test-part.h diff --git a/ext/googletest/include/gtest/gtest-typed-test.h b/ext/googletest/googletest/include/gtest/gtest-typed-test.h similarity index 100% rename from ext/googletest/include/gtest/gtest-typed-test.h rename to ext/googletest/googletest/include/gtest/gtest-typed-test.h diff --git a/ext/googletest/include/gtest/gtest.h b/ext/googletest/googletest/include/gtest/gtest.h similarity index 100% rename from ext/googletest/include/gtest/gtest.h rename to ext/googletest/googletest/include/gtest/gtest.h diff --git a/ext/googletest/include/gtest/gtest_pred_impl.h b/ext/googletest/googletest/include/gtest/gtest_pred_impl.h similarity index 100% rename from ext/googletest/include/gtest/gtest_pred_impl.h rename to ext/googletest/googletest/include/gtest/gtest_pred_impl.h diff --git a/ext/googletest/include/gtest/gtest_prod.h b/ext/googletest/googletest/include/gtest/gtest_prod.h similarity index 100% rename from ext/googletest/include/gtest/gtest_prod.h rename to ext/googletest/googletest/include/gtest/gtest_prod.h diff --git a/ext/googletest/include/gtest/internal/custom/gtest-port.h b/ext/googletest/googletest/include/gtest/internal/custom/gtest-port.h similarity index 100% rename from ext/googletest/include/gtest/internal/custom/gtest-port.h rename to ext/googletest/googletest/include/gtest/internal/custom/gtest-port.h diff --git a/ext/googletest/include/gtest/internal/custom/gtest-printers.h b/ext/googletest/googletest/include/gtest/internal/custom/gtest-printers.h similarity index 100% rename from ext/googletest/include/gtest/internal/custom/gtest-printers.h rename to ext/googletest/googletest/include/gtest/internal/custom/gtest-printers.h diff --git a/ext/googletest/include/gtest/internal/custom/gtest.h b/ext/googletest/googletest/include/gtest/internal/custom/gtest.h similarity index 100% rename from ext/googletest/include/gtest/internal/custom/gtest.h rename to ext/googletest/googletest/include/gtest/internal/custom/gtest.h diff --git a/ext/googletest/include/gtest/internal/gtest-death-test-internal.h b/ext/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-death-test-internal.h rename to ext/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h diff --git a/ext/googletest/include/gtest/internal/gtest-filepath.h b/ext/googletest/googletest/include/gtest/internal/gtest-filepath.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-filepath.h rename to ext/googletest/googletest/include/gtest/internal/gtest-filepath.h diff --git a/ext/googletest/include/gtest/internal/gtest-internal.h b/ext/googletest/googletest/include/gtest/internal/gtest-internal.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-internal.h rename to ext/googletest/googletest/include/gtest/internal/gtest-internal.h diff --git a/ext/googletest/include/gtest/internal/gtest-linked_ptr.h b/ext/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-linked_ptr.h rename to ext/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h diff --git a/ext/googletest/include/gtest/internal/gtest-param-util-generated.h b/ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-param-util-generated.h rename to ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h diff --git a/ext/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-param-util-generated.h.pump rename to ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump diff --git a/ext/googletest/include/gtest/internal/gtest-param-util.h b/ext/googletest/googletest/include/gtest/internal/gtest-param-util.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-param-util.h rename to ext/googletest/googletest/include/gtest/internal/gtest-param-util.h diff --git a/ext/googletest/include/gtest/internal/gtest-port-arch.h b/ext/googletest/googletest/include/gtest/internal/gtest-port-arch.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-port-arch.h rename to ext/googletest/googletest/include/gtest/internal/gtest-port-arch.h diff --git a/ext/googletest/include/gtest/internal/gtest-port.h b/ext/googletest/googletest/include/gtest/internal/gtest-port.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-port.h rename to ext/googletest/googletest/include/gtest/internal/gtest-port.h diff --git a/ext/googletest/include/gtest/internal/gtest-string.h b/ext/googletest/googletest/include/gtest/internal/gtest-string.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-string.h rename to ext/googletest/googletest/include/gtest/internal/gtest-string.h diff --git a/ext/googletest/include/gtest/internal/gtest-tuple.h b/ext/googletest/googletest/include/gtest/internal/gtest-tuple.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-tuple.h rename to ext/googletest/googletest/include/gtest/internal/gtest-tuple.h diff --git a/ext/googletest/include/gtest/internal/gtest-tuple.h.pump b/ext/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-tuple.h.pump rename to ext/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump diff --git a/ext/googletest/include/gtest/internal/gtest-type-util.h b/ext/googletest/googletest/include/gtest/internal/gtest-type-util.h similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-type-util.h rename to ext/googletest/googletest/include/gtest/internal/gtest-type-util.h diff --git a/ext/googletest/include/gtest/internal/gtest-type-util.h.pump b/ext/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump similarity index 100% rename from ext/googletest/include/gtest/internal/gtest-type-util.h.pump rename to ext/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump diff --git a/ext/googletest/m4/acx_pthread.m4 b/ext/googletest/googletest/m4/acx_pthread.m4 similarity index 100% rename from ext/googletest/m4/acx_pthread.m4 rename to ext/googletest/googletest/m4/acx_pthread.m4 diff --git a/ext/googletest/m4/gtest.m4 b/ext/googletest/googletest/m4/gtest.m4 similarity index 100% rename from ext/googletest/m4/gtest.m4 rename to ext/googletest/googletest/m4/gtest.m4 diff --git a/ext/googletest/make/Makefile b/ext/googletest/googletest/make/Makefile similarity index 100% rename from ext/googletest/make/Makefile rename to ext/googletest/googletest/make/Makefile diff --git a/ext/googletest/msvc/gtest-md.sln b/ext/googletest/googletest/msvc/gtest-md.sln similarity index 100% rename from ext/googletest/msvc/gtest-md.sln rename to ext/googletest/googletest/msvc/gtest-md.sln diff --git a/ext/googletest/msvc/gtest-md.vcproj b/ext/googletest/googletest/msvc/gtest-md.vcproj similarity index 100% rename from ext/googletest/msvc/gtest-md.vcproj rename to ext/googletest/googletest/msvc/gtest-md.vcproj diff --git a/ext/googletest/msvc/gtest.sln b/ext/googletest/googletest/msvc/gtest.sln similarity index 100% rename from ext/googletest/msvc/gtest.sln rename to ext/googletest/googletest/msvc/gtest.sln diff --git a/ext/googletest/msvc/gtest.vcproj b/ext/googletest/googletest/msvc/gtest.vcproj similarity index 100% rename from ext/googletest/msvc/gtest.vcproj rename to ext/googletest/googletest/msvc/gtest.vcproj diff --git a/ext/googletest/msvc/gtest_main-md.vcproj b/ext/googletest/googletest/msvc/gtest_main-md.vcproj similarity index 100% rename from ext/googletest/msvc/gtest_main-md.vcproj rename to ext/googletest/googletest/msvc/gtest_main-md.vcproj diff --git a/ext/googletest/msvc/gtest_main.vcproj b/ext/googletest/googletest/msvc/gtest_main.vcproj similarity index 100% rename from ext/googletest/msvc/gtest_main.vcproj rename to ext/googletest/googletest/msvc/gtest_main.vcproj diff --git a/ext/googletest/msvc/gtest_prod_test-md.vcproj b/ext/googletest/googletest/msvc/gtest_prod_test-md.vcproj similarity index 100% rename from ext/googletest/msvc/gtest_prod_test-md.vcproj rename to ext/googletest/googletest/msvc/gtest_prod_test-md.vcproj diff --git a/ext/googletest/msvc/gtest_prod_test.vcproj b/ext/googletest/googletest/msvc/gtest_prod_test.vcproj similarity index 100% rename from ext/googletest/msvc/gtest_prod_test.vcproj rename to ext/googletest/googletest/msvc/gtest_prod_test.vcproj diff --git a/ext/googletest/msvc/gtest_unittest-md.vcproj b/ext/googletest/googletest/msvc/gtest_unittest-md.vcproj similarity index 100% rename from ext/googletest/msvc/gtest_unittest-md.vcproj rename to ext/googletest/googletest/msvc/gtest_unittest-md.vcproj diff --git a/ext/googletest/msvc/gtest_unittest.vcproj b/ext/googletest/googletest/msvc/gtest_unittest.vcproj similarity index 100% rename from ext/googletest/msvc/gtest_unittest.vcproj rename to ext/googletest/googletest/msvc/gtest_unittest.vcproj diff --git a/ext/googletest/samples/prime_tables.h b/ext/googletest/googletest/samples/prime_tables.h similarity index 100% rename from ext/googletest/samples/prime_tables.h rename to ext/googletest/googletest/samples/prime_tables.h diff --git a/ext/googletest/samples/sample1.cc b/ext/googletest/googletest/samples/sample1.cc similarity index 100% rename from ext/googletest/samples/sample1.cc rename to ext/googletest/googletest/samples/sample1.cc diff --git a/ext/googletest/samples/sample1.h b/ext/googletest/googletest/samples/sample1.h similarity index 100% rename from ext/googletest/samples/sample1.h rename to ext/googletest/googletest/samples/sample1.h diff --git a/ext/googletest/samples/sample10_unittest.cc b/ext/googletest/googletest/samples/sample10_unittest.cc similarity index 100% rename from ext/googletest/samples/sample10_unittest.cc rename to ext/googletest/googletest/samples/sample10_unittest.cc diff --git a/ext/googletest/samples/sample1_unittest.cc b/ext/googletest/googletest/samples/sample1_unittest.cc similarity index 100% rename from ext/googletest/samples/sample1_unittest.cc rename to ext/googletest/googletest/samples/sample1_unittest.cc diff --git a/ext/googletest/samples/sample2.cc b/ext/googletest/googletest/samples/sample2.cc similarity index 100% rename from ext/googletest/samples/sample2.cc rename to ext/googletest/googletest/samples/sample2.cc diff --git a/ext/googletest/samples/sample2.h b/ext/googletest/googletest/samples/sample2.h similarity index 100% rename from ext/googletest/samples/sample2.h rename to ext/googletest/googletest/samples/sample2.h diff --git a/ext/googletest/samples/sample2_unittest.cc b/ext/googletest/googletest/samples/sample2_unittest.cc similarity index 100% rename from ext/googletest/samples/sample2_unittest.cc rename to ext/googletest/googletest/samples/sample2_unittest.cc diff --git a/ext/googletest/samples/sample3-inl.h b/ext/googletest/googletest/samples/sample3-inl.h similarity index 100% rename from ext/googletest/samples/sample3-inl.h rename to ext/googletest/googletest/samples/sample3-inl.h diff --git a/ext/googletest/samples/sample3_unittest.cc b/ext/googletest/googletest/samples/sample3_unittest.cc similarity index 100% rename from ext/googletest/samples/sample3_unittest.cc rename to ext/googletest/googletest/samples/sample3_unittest.cc diff --git a/ext/googletest/samples/sample4.cc b/ext/googletest/googletest/samples/sample4.cc similarity index 100% rename from ext/googletest/samples/sample4.cc rename to ext/googletest/googletest/samples/sample4.cc diff --git a/ext/googletest/samples/sample4.h b/ext/googletest/googletest/samples/sample4.h similarity index 100% rename from ext/googletest/samples/sample4.h rename to ext/googletest/googletest/samples/sample4.h diff --git a/ext/googletest/samples/sample4_unittest.cc b/ext/googletest/googletest/samples/sample4_unittest.cc similarity index 100% rename from ext/googletest/samples/sample4_unittest.cc rename to ext/googletest/googletest/samples/sample4_unittest.cc diff --git a/ext/googletest/samples/sample5_unittest.cc b/ext/googletest/googletest/samples/sample5_unittest.cc similarity index 100% rename from ext/googletest/samples/sample5_unittest.cc rename to ext/googletest/googletest/samples/sample5_unittest.cc diff --git a/ext/googletest/samples/sample6_unittest.cc b/ext/googletest/googletest/samples/sample6_unittest.cc similarity index 100% rename from ext/googletest/samples/sample6_unittest.cc rename to ext/googletest/googletest/samples/sample6_unittest.cc diff --git a/ext/googletest/samples/sample7_unittest.cc b/ext/googletest/googletest/samples/sample7_unittest.cc similarity index 100% rename from ext/googletest/samples/sample7_unittest.cc rename to ext/googletest/googletest/samples/sample7_unittest.cc diff --git a/ext/googletest/samples/sample8_unittest.cc b/ext/googletest/googletest/samples/sample8_unittest.cc similarity index 100% rename from ext/googletest/samples/sample8_unittest.cc rename to ext/googletest/googletest/samples/sample8_unittest.cc diff --git a/ext/googletest/samples/sample9_unittest.cc b/ext/googletest/googletest/samples/sample9_unittest.cc similarity index 100% rename from ext/googletest/samples/sample9_unittest.cc rename to ext/googletest/googletest/samples/sample9_unittest.cc diff --git a/ext/googletest/scripts/common.py b/ext/googletest/googletest/scripts/common.py similarity index 100% rename from ext/googletest/scripts/common.py rename to ext/googletest/googletest/scripts/common.py diff --git a/ext/googletest/scripts/fuse_gtest_files.py b/ext/googletest/googletest/scripts/fuse_gtest_files.py similarity index 100% rename from ext/googletest/scripts/fuse_gtest_files.py rename to ext/googletest/googletest/scripts/fuse_gtest_files.py diff --git a/ext/googletest/scripts/gen_gtest_pred_impl.py b/ext/googletest/googletest/scripts/gen_gtest_pred_impl.py similarity index 100% rename from ext/googletest/scripts/gen_gtest_pred_impl.py rename to ext/googletest/googletest/scripts/gen_gtest_pred_impl.py diff --git a/ext/googletest/scripts/gtest-config.in b/ext/googletest/googletest/scripts/gtest-config.in similarity index 100% rename from ext/googletest/scripts/gtest-config.in rename to ext/googletest/googletest/scripts/gtest-config.in diff --git a/ext/googletest/scripts/pump.py b/ext/googletest/googletest/scripts/pump.py similarity index 100% rename from ext/googletest/scripts/pump.py rename to ext/googletest/googletest/scripts/pump.py diff --git a/ext/googletest/scripts/release_docs.py b/ext/googletest/googletest/scripts/release_docs.py similarity index 100% rename from ext/googletest/scripts/release_docs.py rename to ext/googletest/googletest/scripts/release_docs.py diff --git a/ext/googletest/scripts/test/Makefile b/ext/googletest/googletest/scripts/test/Makefile similarity index 100% rename from ext/googletest/scripts/test/Makefile rename to ext/googletest/googletest/scripts/test/Makefile diff --git a/ext/googletest/scripts/upload.py b/ext/googletest/googletest/scripts/upload.py similarity index 100% rename from ext/googletest/scripts/upload.py rename to ext/googletest/googletest/scripts/upload.py diff --git a/ext/googletest/scripts/upload_gtest.py b/ext/googletest/googletest/scripts/upload_gtest.py similarity index 100% rename from ext/googletest/scripts/upload_gtest.py rename to ext/googletest/googletest/scripts/upload_gtest.py diff --git a/ext/googletest/src/gtest-all.cc b/ext/googletest/googletest/src/gtest-all.cc similarity index 100% rename from ext/googletest/src/gtest-all.cc rename to ext/googletest/googletest/src/gtest-all.cc diff --git a/ext/googletest/src/gtest-death-test.cc b/ext/googletest/googletest/src/gtest-death-test.cc similarity index 100% rename from ext/googletest/src/gtest-death-test.cc rename to ext/googletest/googletest/src/gtest-death-test.cc diff --git a/ext/googletest/src/gtest-filepath.cc b/ext/googletest/googletest/src/gtest-filepath.cc similarity index 100% rename from ext/googletest/src/gtest-filepath.cc rename to ext/googletest/googletest/src/gtest-filepath.cc diff --git a/ext/googletest/src/gtest-internal-inl.h b/ext/googletest/googletest/src/gtest-internal-inl.h similarity index 100% rename from ext/googletest/src/gtest-internal-inl.h rename to ext/googletest/googletest/src/gtest-internal-inl.h diff --git a/ext/googletest/src/gtest-port.cc b/ext/googletest/googletest/src/gtest-port.cc similarity index 100% rename from ext/googletest/src/gtest-port.cc rename to ext/googletest/googletest/src/gtest-port.cc diff --git a/ext/googletest/src/gtest-printers.cc b/ext/googletest/googletest/src/gtest-printers.cc similarity index 100% rename from ext/googletest/src/gtest-printers.cc rename to ext/googletest/googletest/src/gtest-printers.cc diff --git a/ext/googletest/src/gtest-test-part.cc b/ext/googletest/googletest/src/gtest-test-part.cc similarity index 100% rename from ext/googletest/src/gtest-test-part.cc rename to ext/googletest/googletest/src/gtest-test-part.cc diff --git a/ext/googletest/src/gtest-typed-test.cc b/ext/googletest/googletest/src/gtest-typed-test.cc similarity index 100% rename from ext/googletest/src/gtest-typed-test.cc rename to ext/googletest/googletest/src/gtest-typed-test.cc diff --git a/ext/googletest/src/gtest.cc b/ext/googletest/googletest/src/gtest.cc similarity index 100% rename from ext/googletest/src/gtest.cc rename to ext/googletest/googletest/src/gtest.cc diff --git a/ext/googletest/src/gtest_main.cc b/ext/googletest/googletest/src/gtest_main.cc similarity index 100% rename from ext/googletest/src/gtest_main.cc rename to ext/googletest/googletest/src/gtest_main.cc diff --git a/ext/googletest/test/gtest-death-test_ex_test.cc b/ext/googletest/googletest/test/gtest-death-test_ex_test.cc similarity index 100% rename from ext/googletest/test/gtest-death-test_ex_test.cc rename to ext/googletest/googletest/test/gtest-death-test_ex_test.cc diff --git a/ext/googletest/test/gtest-death-test_test.cc b/ext/googletest/googletest/test/gtest-death-test_test.cc similarity index 100% rename from ext/googletest/test/gtest-death-test_test.cc rename to ext/googletest/googletest/test/gtest-death-test_test.cc diff --git a/ext/googletest/test/gtest-filepath_test.cc b/ext/googletest/googletest/test/gtest-filepath_test.cc similarity index 100% rename from ext/googletest/test/gtest-filepath_test.cc rename to ext/googletest/googletest/test/gtest-filepath_test.cc diff --git a/ext/googletest/test/gtest-linked_ptr_test.cc b/ext/googletest/googletest/test/gtest-linked_ptr_test.cc similarity index 100% rename from ext/googletest/test/gtest-linked_ptr_test.cc rename to ext/googletest/googletest/test/gtest-linked_ptr_test.cc diff --git a/ext/googletest/test/gtest-listener_test.cc b/ext/googletest/googletest/test/gtest-listener_test.cc similarity index 100% rename from ext/googletest/test/gtest-listener_test.cc rename to ext/googletest/googletest/test/gtest-listener_test.cc diff --git a/ext/googletest/test/gtest-message_test.cc b/ext/googletest/googletest/test/gtest-message_test.cc similarity index 100% rename from ext/googletest/test/gtest-message_test.cc rename to ext/googletest/googletest/test/gtest-message_test.cc diff --git a/ext/googletest/test/gtest-options_test.cc b/ext/googletest/googletest/test/gtest-options_test.cc similarity index 100% rename from ext/googletest/test/gtest-options_test.cc rename to ext/googletest/googletest/test/gtest-options_test.cc diff --git a/ext/googletest/test/gtest-param-test2_test.cc b/ext/googletest/googletest/test/gtest-param-test2_test.cc similarity index 100% rename from ext/googletest/test/gtest-param-test2_test.cc rename to ext/googletest/googletest/test/gtest-param-test2_test.cc diff --git a/ext/googletest/test/gtest-param-test_test.cc b/ext/googletest/googletest/test/gtest-param-test_test.cc similarity index 100% rename from ext/googletest/test/gtest-param-test_test.cc rename to ext/googletest/googletest/test/gtest-param-test_test.cc diff --git a/ext/googletest/test/gtest-param-test_test.h b/ext/googletest/googletest/test/gtest-param-test_test.h similarity index 100% rename from ext/googletest/test/gtest-param-test_test.h rename to ext/googletest/googletest/test/gtest-param-test_test.h diff --git a/ext/googletest/test/gtest-port_test.cc b/ext/googletest/googletest/test/gtest-port_test.cc similarity index 100% rename from ext/googletest/test/gtest-port_test.cc rename to ext/googletest/googletest/test/gtest-port_test.cc diff --git a/ext/googletest/test/gtest-printers_test.cc b/ext/googletest/googletest/test/gtest-printers_test.cc similarity index 100% rename from ext/googletest/test/gtest-printers_test.cc rename to ext/googletest/googletest/test/gtest-printers_test.cc diff --git a/ext/googletest/test/gtest-test-part_test.cc b/ext/googletest/googletest/test/gtest-test-part_test.cc similarity index 100% rename from ext/googletest/test/gtest-test-part_test.cc rename to ext/googletest/googletest/test/gtest-test-part_test.cc diff --git a/ext/googletest/test/gtest-tuple_test.cc b/ext/googletest/googletest/test/gtest-tuple_test.cc similarity index 100% rename from ext/googletest/test/gtest-tuple_test.cc rename to ext/googletest/googletest/test/gtest-tuple_test.cc diff --git a/ext/googletest/test/gtest-typed-test2_test.cc b/ext/googletest/googletest/test/gtest-typed-test2_test.cc similarity index 100% rename from ext/googletest/test/gtest-typed-test2_test.cc rename to ext/googletest/googletest/test/gtest-typed-test2_test.cc diff --git a/ext/googletest/test/gtest-typed-test_test.cc b/ext/googletest/googletest/test/gtest-typed-test_test.cc similarity index 100% rename from ext/googletest/test/gtest-typed-test_test.cc rename to ext/googletest/googletest/test/gtest-typed-test_test.cc diff --git a/ext/googletest/test/gtest-typed-test_test.h b/ext/googletest/googletest/test/gtest-typed-test_test.h similarity index 100% rename from ext/googletest/test/gtest-typed-test_test.h rename to ext/googletest/googletest/test/gtest-typed-test_test.h diff --git a/ext/googletest/test/gtest-unittest-api_test.cc b/ext/googletest/googletest/test/gtest-unittest-api_test.cc similarity index 100% rename from ext/googletest/test/gtest-unittest-api_test.cc rename to ext/googletest/googletest/test/gtest-unittest-api_test.cc diff --git a/ext/googletest/test/gtest_all_test.cc b/ext/googletest/googletest/test/gtest_all_test.cc similarity index 100% rename from ext/googletest/test/gtest_all_test.cc rename to ext/googletest/googletest/test/gtest_all_test.cc diff --git a/ext/googletest/test/gtest_break_on_failure_unittest.py b/ext/googletest/googletest/test/gtest_break_on_failure_unittest.py similarity index 100% rename from ext/googletest/test/gtest_break_on_failure_unittest.py rename to ext/googletest/googletest/test/gtest_break_on_failure_unittest.py diff --git a/ext/googletest/test/gtest_break_on_failure_unittest_.cc b/ext/googletest/googletest/test/gtest_break_on_failure_unittest_.cc similarity index 100% rename from ext/googletest/test/gtest_break_on_failure_unittest_.cc rename to ext/googletest/googletest/test/gtest_break_on_failure_unittest_.cc diff --git a/ext/googletest/test/gtest_catch_exceptions_test.py b/ext/googletest/googletest/test/gtest_catch_exceptions_test.py similarity index 100% rename from ext/googletest/test/gtest_catch_exceptions_test.py rename to ext/googletest/googletest/test/gtest_catch_exceptions_test.py diff --git a/ext/googletest/test/gtest_catch_exceptions_test_.cc b/ext/googletest/googletest/test/gtest_catch_exceptions_test_.cc similarity index 100% rename from ext/googletest/test/gtest_catch_exceptions_test_.cc rename to ext/googletest/googletest/test/gtest_catch_exceptions_test_.cc diff --git a/ext/googletest/test/gtest_color_test.py b/ext/googletest/googletest/test/gtest_color_test.py similarity index 100% rename from ext/googletest/test/gtest_color_test.py rename to ext/googletest/googletest/test/gtest_color_test.py diff --git a/ext/googletest/test/gtest_color_test_.cc b/ext/googletest/googletest/test/gtest_color_test_.cc similarity index 100% rename from ext/googletest/test/gtest_color_test_.cc rename to ext/googletest/googletest/test/gtest_color_test_.cc diff --git a/ext/googletest/test/gtest_env_var_test.py b/ext/googletest/googletest/test/gtest_env_var_test.py similarity index 100% rename from ext/googletest/test/gtest_env_var_test.py rename to ext/googletest/googletest/test/gtest_env_var_test.py diff --git a/ext/googletest/test/gtest_env_var_test_.cc b/ext/googletest/googletest/test/gtest_env_var_test_.cc similarity index 100% rename from ext/googletest/test/gtest_env_var_test_.cc rename to ext/googletest/googletest/test/gtest_env_var_test_.cc diff --git a/ext/googletest/test/gtest_environment_test.cc b/ext/googletest/googletest/test/gtest_environment_test.cc similarity index 100% rename from ext/googletest/test/gtest_environment_test.cc rename to ext/googletest/googletest/test/gtest_environment_test.cc diff --git a/ext/googletest/test/gtest_filter_unittest.py b/ext/googletest/googletest/test/gtest_filter_unittest.py similarity index 100% rename from ext/googletest/test/gtest_filter_unittest.py rename to ext/googletest/googletest/test/gtest_filter_unittest.py diff --git a/ext/googletest/test/gtest_filter_unittest_.cc b/ext/googletest/googletest/test/gtest_filter_unittest_.cc similarity index 100% rename from ext/googletest/test/gtest_filter_unittest_.cc rename to ext/googletest/googletest/test/gtest_filter_unittest_.cc diff --git a/ext/googletest/test/gtest_help_test.py b/ext/googletest/googletest/test/gtest_help_test.py similarity index 100% rename from ext/googletest/test/gtest_help_test.py rename to ext/googletest/googletest/test/gtest_help_test.py diff --git a/ext/googletest/test/gtest_help_test_.cc b/ext/googletest/googletest/test/gtest_help_test_.cc similarity index 100% rename from ext/googletest/test/gtest_help_test_.cc rename to ext/googletest/googletest/test/gtest_help_test_.cc diff --git a/ext/googletest/test/gtest_list_tests_unittest.py b/ext/googletest/googletest/test/gtest_list_tests_unittest.py similarity index 100% rename from ext/googletest/test/gtest_list_tests_unittest.py rename to ext/googletest/googletest/test/gtest_list_tests_unittest.py diff --git a/ext/googletest/test/gtest_list_tests_unittest_.cc b/ext/googletest/googletest/test/gtest_list_tests_unittest_.cc similarity index 100% rename from ext/googletest/test/gtest_list_tests_unittest_.cc rename to ext/googletest/googletest/test/gtest_list_tests_unittest_.cc diff --git a/ext/googletest/test/gtest_main_unittest.cc b/ext/googletest/googletest/test/gtest_main_unittest.cc similarity index 100% rename from ext/googletest/test/gtest_main_unittest.cc rename to ext/googletest/googletest/test/gtest_main_unittest.cc diff --git a/ext/googletest/test/gtest_no_test_unittest.cc b/ext/googletest/googletest/test/gtest_no_test_unittest.cc similarity index 100% rename from ext/googletest/test/gtest_no_test_unittest.cc rename to ext/googletest/googletest/test/gtest_no_test_unittest.cc diff --git a/ext/googletest/test/gtest_output_test.py b/ext/googletest/googletest/test/gtest_output_test.py similarity index 100% rename from ext/googletest/test/gtest_output_test.py rename to ext/googletest/googletest/test/gtest_output_test.py diff --git a/ext/googletest/test/gtest_output_test_.cc b/ext/googletest/googletest/test/gtest_output_test_.cc similarity index 100% rename from ext/googletest/test/gtest_output_test_.cc rename to ext/googletest/googletest/test/gtest_output_test_.cc diff --git a/ext/googletest/test/gtest_output_test_golden_lin.txt b/ext/googletest/googletest/test/gtest_output_test_golden_lin.txt similarity index 100% rename from ext/googletest/test/gtest_output_test_golden_lin.txt rename to ext/googletest/googletest/test/gtest_output_test_golden_lin.txt diff --git a/ext/googletest/test/gtest_pred_impl_unittest.cc b/ext/googletest/googletest/test/gtest_pred_impl_unittest.cc similarity index 100% rename from ext/googletest/test/gtest_pred_impl_unittest.cc rename to ext/googletest/googletest/test/gtest_pred_impl_unittest.cc diff --git a/ext/googletest/test/gtest_premature_exit_test.cc b/ext/googletest/googletest/test/gtest_premature_exit_test.cc similarity index 100% rename from ext/googletest/test/gtest_premature_exit_test.cc rename to ext/googletest/googletest/test/gtest_premature_exit_test.cc diff --git a/ext/googletest/test/gtest_prod_test.cc b/ext/googletest/googletest/test/gtest_prod_test.cc similarity index 100% rename from ext/googletest/test/gtest_prod_test.cc rename to ext/googletest/googletest/test/gtest_prod_test.cc diff --git a/ext/googletest/test/gtest_repeat_test.cc b/ext/googletest/googletest/test/gtest_repeat_test.cc similarity index 100% rename from ext/googletest/test/gtest_repeat_test.cc rename to ext/googletest/googletest/test/gtest_repeat_test.cc diff --git a/ext/googletest/test/gtest_shuffle_test.py b/ext/googletest/googletest/test/gtest_shuffle_test.py similarity index 100% rename from ext/googletest/test/gtest_shuffle_test.py rename to ext/googletest/googletest/test/gtest_shuffle_test.py diff --git a/ext/googletest/test/gtest_shuffle_test_.cc b/ext/googletest/googletest/test/gtest_shuffle_test_.cc similarity index 100% rename from ext/googletest/test/gtest_shuffle_test_.cc rename to ext/googletest/googletest/test/gtest_shuffle_test_.cc diff --git a/ext/googletest/test/gtest_sole_header_test.cc b/ext/googletest/googletest/test/gtest_sole_header_test.cc similarity index 100% rename from ext/googletest/test/gtest_sole_header_test.cc rename to ext/googletest/googletest/test/gtest_sole_header_test.cc diff --git a/ext/googletest/test/gtest_stress_test.cc b/ext/googletest/googletest/test/gtest_stress_test.cc similarity index 100% rename from ext/googletest/test/gtest_stress_test.cc rename to ext/googletest/googletest/test/gtest_stress_test.cc diff --git a/ext/googletest/test/gtest_test_utils.py b/ext/googletest/googletest/test/gtest_test_utils.py similarity index 100% rename from ext/googletest/test/gtest_test_utils.py rename to ext/googletest/googletest/test/gtest_test_utils.py diff --git a/ext/googletest/test/gtest_throw_on_failure_ex_test.cc b/ext/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc similarity index 100% rename from ext/googletest/test/gtest_throw_on_failure_ex_test.cc rename to ext/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc diff --git a/ext/googletest/test/gtest_throw_on_failure_test.py b/ext/googletest/googletest/test/gtest_throw_on_failure_test.py similarity index 100% rename from ext/googletest/test/gtest_throw_on_failure_test.py rename to ext/googletest/googletest/test/gtest_throw_on_failure_test.py diff --git a/ext/googletest/test/gtest_throw_on_failure_test_.cc b/ext/googletest/googletest/test/gtest_throw_on_failure_test_.cc similarity index 100% rename from ext/googletest/test/gtest_throw_on_failure_test_.cc rename to ext/googletest/googletest/test/gtest_throw_on_failure_test_.cc diff --git a/ext/googletest/test/gtest_uninitialized_test.py b/ext/googletest/googletest/test/gtest_uninitialized_test.py similarity index 100% rename from ext/googletest/test/gtest_uninitialized_test.py rename to ext/googletest/googletest/test/gtest_uninitialized_test.py diff --git a/ext/googletest/test/gtest_uninitialized_test_.cc b/ext/googletest/googletest/test/gtest_uninitialized_test_.cc similarity index 100% rename from ext/googletest/test/gtest_uninitialized_test_.cc rename to ext/googletest/googletest/test/gtest_uninitialized_test_.cc diff --git a/ext/googletest/test/gtest_unittest.cc b/ext/googletest/googletest/test/gtest_unittest.cc similarity index 100% rename from ext/googletest/test/gtest_unittest.cc rename to ext/googletest/googletest/test/gtest_unittest.cc diff --git a/ext/googletest/test/gtest_xml_outfile1_test_.cc b/ext/googletest/googletest/test/gtest_xml_outfile1_test_.cc similarity index 100% rename from ext/googletest/test/gtest_xml_outfile1_test_.cc rename to ext/googletest/googletest/test/gtest_xml_outfile1_test_.cc diff --git a/ext/googletest/test/gtest_xml_outfile2_test_.cc b/ext/googletest/googletest/test/gtest_xml_outfile2_test_.cc similarity index 100% rename from ext/googletest/test/gtest_xml_outfile2_test_.cc rename to ext/googletest/googletest/test/gtest_xml_outfile2_test_.cc diff --git a/ext/googletest/test/gtest_xml_outfiles_test.py b/ext/googletest/googletest/test/gtest_xml_outfiles_test.py similarity index 100% rename from ext/googletest/test/gtest_xml_outfiles_test.py rename to ext/googletest/googletest/test/gtest_xml_outfiles_test.py diff --git a/ext/googletest/test/gtest_xml_output_unittest.py b/ext/googletest/googletest/test/gtest_xml_output_unittest.py similarity index 100% rename from ext/googletest/test/gtest_xml_output_unittest.py rename to ext/googletest/googletest/test/gtest_xml_output_unittest.py diff --git a/ext/googletest/test/gtest_xml_output_unittest_.cc b/ext/googletest/googletest/test/gtest_xml_output_unittest_.cc similarity index 100% rename from ext/googletest/test/gtest_xml_output_unittest_.cc rename to ext/googletest/googletest/test/gtest_xml_output_unittest_.cc diff --git a/ext/googletest/test/gtest_xml_test_utils.py b/ext/googletest/googletest/test/gtest_xml_test_utils.py similarity index 100% rename from ext/googletest/test/gtest_xml_test_utils.py rename to ext/googletest/googletest/test/gtest_xml_test_utils.py diff --git a/ext/googletest/test/production.cc b/ext/googletest/googletest/test/production.cc similarity index 100% rename from ext/googletest/test/production.cc rename to ext/googletest/googletest/test/production.cc diff --git a/ext/googletest/test/production.h b/ext/googletest/googletest/test/production.h similarity index 100% rename from ext/googletest/test/production.h rename to ext/googletest/googletest/test/production.h diff --git a/ext/googletest/xcode/Config/DebugProject.xcconfig b/ext/googletest/googletest/xcode/Config/DebugProject.xcconfig similarity index 100% rename from ext/googletest/xcode/Config/DebugProject.xcconfig rename to ext/googletest/googletest/xcode/Config/DebugProject.xcconfig diff --git a/ext/googletest/xcode/Config/FrameworkTarget.xcconfig b/ext/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig similarity index 100% rename from ext/googletest/xcode/Config/FrameworkTarget.xcconfig rename to ext/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig diff --git a/ext/googletest/xcode/Config/General.xcconfig b/ext/googletest/googletest/xcode/Config/General.xcconfig similarity index 100% rename from ext/googletest/xcode/Config/General.xcconfig rename to ext/googletest/googletest/xcode/Config/General.xcconfig diff --git a/ext/googletest/xcode/Config/ReleaseProject.xcconfig b/ext/googletest/googletest/xcode/Config/ReleaseProject.xcconfig similarity index 100% rename from ext/googletest/xcode/Config/ReleaseProject.xcconfig rename to ext/googletest/googletest/xcode/Config/ReleaseProject.xcconfig diff --git a/ext/googletest/xcode/Config/StaticLibraryTarget.xcconfig b/ext/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig similarity index 100% rename from ext/googletest/xcode/Config/StaticLibraryTarget.xcconfig rename to ext/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig diff --git a/ext/googletest/xcode/Config/TestTarget.xcconfig b/ext/googletest/googletest/xcode/Config/TestTarget.xcconfig similarity index 100% rename from ext/googletest/xcode/Config/TestTarget.xcconfig rename to ext/googletest/googletest/xcode/Config/TestTarget.xcconfig diff --git a/ext/googletest/xcode/Resources/Info.plist b/ext/googletest/googletest/xcode/Resources/Info.plist similarity index 100% rename from ext/googletest/xcode/Resources/Info.plist rename to ext/googletest/googletest/xcode/Resources/Info.plist diff --git a/ext/googletest/xcode/Samples/FrameworkSample/Info.plist b/ext/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist similarity index 100% rename from ext/googletest/xcode/Samples/FrameworkSample/Info.plist rename to ext/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist diff --git a/ext/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/ext/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj similarity index 100% rename from ext/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj rename to ext/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj diff --git a/ext/googletest/xcode/Samples/FrameworkSample/runtests.sh b/ext/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh similarity index 100% rename from ext/googletest/xcode/Samples/FrameworkSample/runtests.sh rename to ext/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh diff --git a/ext/googletest/xcode/Samples/FrameworkSample/widget.cc b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc similarity index 100% rename from ext/googletest/xcode/Samples/FrameworkSample/widget.cc rename to ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc diff --git a/ext/googletest/xcode/Samples/FrameworkSample/widget.h b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.h similarity index 100% rename from ext/googletest/xcode/Samples/FrameworkSample/widget.h rename to ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.h diff --git a/ext/googletest/xcode/Samples/FrameworkSample/widget_test.cc b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc similarity index 100% rename from ext/googletest/xcode/Samples/FrameworkSample/widget_test.cc rename to ext/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc diff --git a/ext/googletest/xcode/Scripts/runtests.sh b/ext/googletest/googletest/xcode/Scripts/runtests.sh similarity index 100% rename from ext/googletest/xcode/Scripts/runtests.sh rename to ext/googletest/googletest/xcode/Scripts/runtests.sh diff --git a/ext/googletest/xcode/Scripts/versiongenerate.py b/ext/googletest/googletest/xcode/Scripts/versiongenerate.py similarity index 100% rename from ext/googletest/xcode/Scripts/versiongenerate.py rename to ext/googletest/googletest/xcode/Scripts/versiongenerate.py diff --git a/ext/googletest/xcode/gtest.xcodeproj/project.pbxproj b/ext/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj similarity index 100% rename from ext/googletest/xcode/gtest.xcodeproj/project.pbxproj rename to ext/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj -- 2.30.2