Date: Sun, 12 Apr 2020 03:10:29 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r359817 - in projects/import-googletest-1.10.0/contrib/googletest: . ci googlemock googlemock/build-aux googlemock/cmake googlemock/docs googlemock/include/gmock googlemock/include/gmoc... Message-ID: <202004120310.03C3AT5G097180@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Apr 12 03:10:29 2020 New Revision: 359817 URL: https://svnweb.freebsd.org/changeset/base/359817 Log: Merge ^/vendor/googletest/dist@r345048 This rebases the copy of ^/contrib/googletest (and all of our local modifications) on version 1.10.0. Added: projects/import-googletest-1.10.0/contrib/googletest/.clang-format - copied unchanged from r359816, vendor/google/googletest/dist/.clang-format projects/import-googletest-1.10.0/contrib/googletest/ci/build-platformio.sh - copied unchanged from r359816, vendor/google/googletest/dist/ci/build-platformio.sh projects/import-googletest-1.10.0/contrib/googletest/ci/install-platformio.sh - copied unchanged from r359816, vendor/google/googletest/dist/ci/install-platformio.sh projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/cheat_sheet.md - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/docs/cheat_sheet.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/cook_book.md - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/docs/cook_book.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/for_dummies.md - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/docs/for_dummies.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/gmock_faq.md - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/docs/gmock_faq.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-function-mocker.h - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/include/gmock/gmock-function-mocker.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-nice-strict.h - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/include/gmock/gmock-nice-strict.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/internal/gmock-pp.h - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/include/gmock/internal/gmock-pp.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-function-mocker_nc.cc - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/test/gmock-function-mocker_nc.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-function-mocker_nc_test.py - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/test/gmock-function-mocker_nc_test.py projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-function-mocker_test.cc - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/test/gmock-function-mocker_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-pp-string_test.cc - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/test/gmock-pp-string_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-pp_test.cc - copied unchanged from r359816, vendor/google/googletest/dist/googlemock/test/gmock-pp_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/cmake/libgtest.la.in - copied unchanged from r359816, vendor/google/googletest/dist/googletest/cmake/libgtest.la.in projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/pkgconfig.md - copied unchanged from r359816, vendor/google/googletest/dist/googletest/docs/pkgconfig.md projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/pump_manual.md - copied unchanged from r359816, vendor/google/googletest/dist/googletest/docs/pump_manual.md projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-matchers.h - copied unchanged from r359816, vendor/google/googletest/dist/googletest/include/gtest/gtest-matchers.h projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-matchers.cc - copied unchanged from r359816, vendor/google/googletest/dist/googletest/src/gtest-matchers.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_skip_environment_check_output_test.py - copied unchanged from r359816, vendor/google/googletest/dist/googletest/test/gtest_skip_environment_check_output_test.py projects/import-googletest-1.10.0/contrib/googletest/library.json - copied unchanged from r359816, vendor/google/googletest/dist/library.json projects/import-googletest-1.10.0/contrib/googletest/platformio.ini - copied unchanged from r359816, vendor/google/googletest/dist/platformio.ini Deleted: projects/import-googletest-1.10.0/contrib/googletest/ci/build-linux-autotools.sh projects/import-googletest-1.10.0/contrib/googletest/googlemock/CHANGES projects/import-googletest-1.10.0/contrib/googletest/googlemock/Makefile.am projects/import-googletest-1.10.0/contrib/googletest/googlemock/build-aux/ projects/import-googletest-1.10.0/contrib/googletest/googlemock/configure.ac projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/CheatSheet.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/CookBook.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/DesignDoc.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/Documentation.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/ForDummies.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/FrequentlyAskedQuestions.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/docs/KnownIssues.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump projects/import-googletest-1.10.0/contrib/googletest/googlemock/make/ projects/import-googletest-1.10.0/contrib/googletest/googlemock/msvc/ projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-generated-internal-utils_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/CHANGES projects/import-googletest-1.10.0/contrib/googletest/googletest/Makefile.am projects/import-googletest-1.10.0/contrib/googletest/googletest/codegear/ projects/import-googletest-1.10.0/contrib/googletest/googletest/configure.ac projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/Pkgconfig.md projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/PumpManual.md projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/XcodeGuide.md projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-param-test.h.pump projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-tuple.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump projects/import-googletest-1.10.0/contrib/googletest/googletest/m4/ projects/import-googletest-1.10.0/contrib/googletest/googletest/make/ projects/import-googletest-1.10.0/contrib/googletest/googletest/msvc/ projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-linked-ptr-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-tuple-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/xcode/ Modified: projects/import-googletest-1.10.0/contrib/googletest/BUILD.bazel projects/import-googletest-1.10.0/contrib/googletest/CMakeLists.txt projects/import-googletest-1.10.0/contrib/googletest/CONTRIBUTING.md projects/import-googletest-1.10.0/contrib/googletest/README.md projects/import-googletest-1.10.0/contrib/googletest/WORKSPACE projects/import-googletest-1.10.0/contrib/googletest/appveyor.yml projects/import-googletest-1.10.0/contrib/googletest/ci/build-linux-bazel.sh projects/import-googletest-1.10.0/contrib/googletest/ci/env-osx.sh projects/import-googletest-1.10.0/contrib/googletest/ci/install-osx.sh projects/import-googletest-1.10.0/contrib/googletest/googlemock/CMakeLists.txt projects/import-googletest-1.10.0/contrib/googletest/googlemock/README.md projects/import-googletest-1.10.0/contrib/googletest/googlemock/cmake/gmock.pc.in projects/import-googletest-1.10.0/contrib/googletest/googlemock/cmake/gmock_main.pc.in projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-actions.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-cardinalities.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-generated-actions.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-generated-matchers.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-matchers.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-more-actions.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock-spec-builders.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/gmock.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/include/gmock/internal/gmock-port.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/scripts/fuse_gmock_files.py projects/import-googletest-1.10.0/contrib/googletest/googlemock/src/gmock-cardinalities.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/src/gmock-internal-utils.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/src/gmock-matchers.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/src/gmock-spec-builders.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/src/gmock.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/src/gmock_main.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/BUILD.bazel projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-actions_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-cardinalities_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-generated-actions_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-generated-function-mockers_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-generated-matchers_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-internal-utils_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-matchers_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-more-actions_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-nice-strict_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock-spec-builders_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock_all_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock_link_test.h projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock_output_test.py projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock_output_test_golden.txt projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock_stress_test.cc projects/import-googletest-1.10.0/contrib/googletest/googlemock/test/gmock_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/CMakeLists.txt projects/import-googletest-1.10.0/contrib/googletest/googletest/README.md projects/import-googletest-1.10.0/contrib/googletest/googletest/cmake/gtest.pc.in projects/import-googletest-1.10.0/contrib/googletest/googletest/cmake/gtest_main.pc.in projects/import-googletest-1.10.0/contrib/googletest/googletest/cmake/internal_utils.cmake projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/advanced.md projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/faq.md projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/primer.md projects/import-googletest-1.10.0/contrib/googletest/googletest/docs/samples.md projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-death-test.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-message.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-param-test.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-printers.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-spi.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-test-part.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest-typed-test.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/gtest_pred_impl.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-filepath.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-internal.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-param-util.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-port-arch.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-port.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-string.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-type-util.h projects/import-googletest-1.10.0/contrib/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/prime_tables.h projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample1.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample1.h projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample10_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample2.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample2.h projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample2_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample3-inl.h projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample3_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample5_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample6_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample7_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample8_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/samples/sample9_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-all.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-death-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-filepath.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-internal-inl.h projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-port.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-printers.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-test-part.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest-typed-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/src/gtest_main.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/BUILD.bazel projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-catch-exceptions-test.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-catch-exceptions-test_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-death-test-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-env-var-test.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-filepath-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-filter-unittest.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-filter-unittest_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-json-outfiles-test.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-json-output-unittest.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-list-tests-unittest_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-listener-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-message-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-options-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-output-test-golden-lin.txt projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-output-test.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-output-test_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-param-test-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-param-test-test.h projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-param-test2-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-port-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-printers-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-shuffle-test_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-test-part-test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-test2_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-throw-on-failure-test.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-throw-on-failure-test_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/googletest-uninitialized-test.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest-typed-test2_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest-typed-test_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest-typed-test_test.h projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest-unittest-api_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_all_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_assert_by_exception_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_environment_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_pred_impl_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_premature_exit_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_repeat_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_stress_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_test_utils.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_unittest.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_xml_outfile1_test_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_xml_outfile2_test_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_xml_outfiles_test.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_xml_output_unittest.py projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_xml_output_unittest_.cc projects/import-googletest-1.10.0/contrib/googletest/googletest/test/gtest_xml_test_utils.py Directory Properties: projects/import-googletest-1.10.0/contrib/googletest/ (props changed) Copied: projects/import-googletest-1.10.0/contrib/googletest/.clang-format (from r359816, vendor/google/googletest/dist/.clang-format) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.10.0/contrib/googletest/.clang-format Sun Apr 12 03:10:29 2020 (r359817, copy of r359816, vendor/google/googletest/dist/.clang-format) @@ -0,0 +1,4 @@ +# Run manually to reformat a file: +# clang-format -i --style=file <file> +Language: Cpp +BasedOnStyle: Google Modified: projects/import-googletest-1.10.0/contrib/googletest/BUILD.bazel ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/BUILD.bazel Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/BUILD.bazel Sun Apr 12 03:10:29 2020 (r359817) @@ -28,29 +28,31 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Author: misterg@google.com (Gennadiy Civil) -# # Bazel Build for Google C++ Testing Framework(Google Test) +load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) config_setting( name = "windows", - values = {"cpu": "x64_windows"}, + constraint_values = ["@bazel_tools//platforms:windows"], ) config_setting( - name = "windows_msvc", - values = {"cpu": "x64_windows_msvc"}, -) - -config_setting( name = "has_absl", values = {"define": "absl=1"}, ) +# Library that defines the FRIEND_TEST macro. +cc_library( + name = "gtest_prod", + hdrs = ["googletest/include/gtest/gtest_prod.h"], + includes = ["googletest/include"], +) + # Google Test including Google Mock cc_library( name = "gtest", @@ -73,21 +75,18 @@ cc_library( "googletest/include/gtest/*.h", "googlemock/include/gmock/*.h", ]), - copts = select( - { - ":windows": [], - ":windows_msvc": [], - "//conditions:default": ["-pthread"], - }, - ), - defines = select( - { - ":has_absl": [ - "GTEST_HAS_ABSL=1", - ], - "//conditions:default": [], - }, - ), + copts = select({ + ":windows": [], + "//conditions:default": ["-pthread"], + }), + defines = select({ + ":has_absl": ["GTEST_HAS_ABSL=1"], + "//conditions:default": [], + }), + features = select({ + ":windows": ["windows_export_all_symbols"], + "//conditions:default": [], + }), includes = [ "googlemock", "googlemock/include", @@ -96,31 +95,28 @@ cc_library( ], linkopts = select({ ":windows": [], - ":windows_msvc": [], - "//conditions:default": [ - "-pthread", + "//conditions:default": ["-pthread"], + }), + deps = select({ + ":has_absl": [ + "@com_google_absl//absl/debugging:failure_signal_handler", + "@com_google_absl//absl/debugging:stacktrace", + "@com_google_absl//absl/debugging:symbolize", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:optional", + "@com_google_absl//absl/types:variant", ], + "//conditions:default": [], }), - deps = select( - { - ":has_absl": [ - "@com_google_absl//absl/debugging:failure_signal_handler", - "@com_google_absl//absl/debugging:stacktrace", - "@com_google_absl//absl/debugging:symbolize", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", - ], - "//conditions:default": [], - }, - ), ) cc_library( name = "gtest_main", - srcs = [ - "googlemock/src/gmock_main.cc", - ], + srcs = ["googlemock/src/gmock_main.cc"], + features = select({ + ":windows": ["windows_export_all_symbols"], + "//conditions:default": [], + }), deps = [":gtest"], ) @@ -139,14 +135,18 @@ cc_library( "googletest/samples/sample3-inl.h", "googletest/samples/sample4.h", ], + features = select({ + ":windows": ["windows_export_all_symbols"], + "//conditions:default": [], + }), ) cc_test( name = "gtest_samples", size = "small", - #All Samples except: - #sample9 ( main ) - #sample10 (main and takes a command line option and needs to be separate) + # All Samples except: + # sample9 (main) + # sample10 (main and takes a command line option and needs to be separate) srcs = [ "googletest/samples/sample1_unittest.cc", "googletest/samples/sample2_unittest.cc", @@ -157,6 +157,7 @@ cc_test( "googletest/samples/sample7_unittest.cc", "googletest/samples/sample8_unittest.cc", ], + linkstatic = 0, deps = [ "gtest_sample_lib", ":gtest_main", @@ -174,7 +175,5 @@ cc_test( name = "sample10_unittest", size = "small", srcs = ["googletest/samples/sample10_unittest.cc"], - deps = [ - ":gtest", - ], + deps = [":gtest"], ) Modified: projects/import-googletest-1.10.0/contrib/googletest/CMakeLists.txt ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/CMakeLists.txt Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/CMakeLists.txt Sun Apr 12 03:10:29 2020 (r359817) @@ -1,3 +1,6 @@ +# Note: CMake support is community-based. The maintainers do not use CMake +# internally. + cmake_minimum_required(VERSION 2.8.8) if (POLICY CMP0048) @@ -5,7 +8,17 @@ if (POLICY CMP0048) endif (POLICY CMP0048) project(googletest-distribution) -set(GOOGLETEST_VERSION 1.9.0) +set(GOOGLETEST_VERSION 1.10.0) + +if (CMAKE_VERSION VERSION_LESS "3.1") + add_definitions(-std=c++11) +else() + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + if(NOT CYGWIN) + set(CMAKE_CXX_EXTENSIONS OFF) + endif() +endif() enable_testing() Modified: projects/import-googletest-1.10.0/contrib/googletest/CONTRIBUTING.md ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/CONTRIBUTING.md Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/CONTRIBUTING.md Sun Apr 12 03:10:29 2020 (r359817) @@ -2,16 +2,16 @@ ## Contributor License Agreements -We'd love to accept your patches! Before we can take them, we -have to jump a couple of legal hurdles. +We'd love to accept your patches! Before we can take them, we have to jump a +couple of legal hurdles. Please fill out either the individual or corporate Contributor License Agreement (CLA). - * If you are an individual writing original source code and you're sure you +* If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an [individual CLA](https://developers.google.com/open-source/cla/individual). - * If you work for a company that wants to allow you to contribute your work, +* If you work for a company that wants to allow you to contribute your work, then you'll need to sign a [corporate CLA](https://developers.google.com/open-source/cla/corporate). @@ -20,141 +20,123 @@ instructions for how to sign and return it. Once we re accept your pull requests. ## Are you a Googler? -If you are a Googler, you can either create an internal change or work on GitHub directly. +If you are a Googler, please make an attempt to submit an internal change rather +than a GitHub Pull Request. If you are not able to submit an internal change a +PR is acceptable as an alternative. ## Contributing A Patch -1. Submit an issue describing your proposed change to the - [issue tracker](https://github.com/google/googletest). -1. Please don't mix more than one logical change per submittal, - because it makes the history hard to follow. If you want to make a - change that doesn't have a corresponding issue in the issue - tracker, please create one. -1. Also, coordinate with team members that are listed on the issue in - question. This ensures that work isn't being duplicated and - communicating your plan early also generally leads to better - patches. -1. If your proposed change is accepted, and you haven't already done so, sign a - Contributor License Agreement (see details above). -1. Fork the desired repo, develop and test your code changes. -1. Ensure that your code adheres to the existing style in the sample to which - you are contributing. -1. Ensure that your code has an appropriate set of unit tests which all pass. -1. Submit a pull request. +1. Submit an issue describing your proposed change to the + [issue tracker](https://github.com/google/googletest). +2. Please don't mix more than one logical change per submittal, because it + makes the history hard to follow. If you want to make a change that doesn't + have a corresponding issue in the issue tracker, please create one. +3. Also, coordinate with team members that are listed on the issue in question. + This ensures that work isn't being duplicated and communicating your plan + early also generally leads to better patches. +4. If your proposed change is accepted, and you haven't already done so, sign a + Contributor License Agreement (see details above). +5. Fork the desired repo, develop and test your code changes. +6. Ensure that your code adheres to the existing style in the sample to which + you are contributing. +7. Ensure that your code has an appropriate set of unit tests which all pass. +8. Submit a pull request. -## The Google Test and Google Mock Communities ## +## The Google Test and Google Mock Communities The Google Test community exists primarily through the -[discussion group](http://groups.google.com/group/googletestframework) -and the GitHub repository. -Likewise, the Google Mock community exists primarily through their own -[discussion group](http://groups.google.com/group/googlemock). -You are definitely encouraged to contribute to the -discussion and you can also help us to keep the effectiveness of the -group high by following and promoting the guidelines listed here. +[discussion group](http://groups.google.com/group/googletestframework) and the +GitHub repository. Likewise, the Google Mock community exists primarily through +their own [discussion group](http://groups.google.com/group/googlemock). You are +definitely encouraged to contribute to the discussion and you can also help us +to keep the effectiveness of the group high by following and promoting the +guidelines listed here. -### Please Be Friendly ### +### Please Be Friendly -Showing courtesy and respect to others is a vital part of the Google -culture, and we strongly encourage everyone participating in Google -Test development to join us in accepting nothing less. Of course, -being courteous is not the same as failing to constructively disagree -with each other, but it does mean that we should be respectful of each -other when enumerating the 42 technical reasons that a particular -proposal may not be the best choice. There's never a reason to be -antagonistic or dismissive toward anyone who is sincerely trying to +Showing courtesy and respect to others is a vital part of the Google culture, +and we strongly encourage everyone participating in Google Test development to +join us in accepting nothing less. Of course, being courteous is not the same as +failing to constructively disagree with each other, but it does mean that we +should be respectful of each other when enumerating the 42 technical reasons +that a particular proposal may not be the best choice. There's never a reason to +be antagonistic or dismissive toward anyone who is sincerely trying to contribute to a discussion. -Sure, C++ testing is serious business and all that, but it's also -a lot of fun. Let's keep it that way. Let's strive to be one of the -friendliest communities in all of open source. +Sure, C++ testing is serious business and all that, but it's also a lot of fun. +Let's keep it that way. Let's strive to be one of the friendliest communities in +all of open source. -As always, discuss Google Test in the official GoogleTest discussion group. -You don't have to actually submit code in order to sign up. Your participation +As always, discuss Google Test in the official GoogleTest discussion group. You +don't have to actually submit code in order to sign up. Your participation itself is a valuable contribution. ## Style -To keep the source consistent, readable, diffable and easy to merge, -we use a fairly rigid coding style, as defined by the [google-styleguide](https://github.com/google/styleguide) project. All patches will be expected -to conform to the style outlined [here](https://google.github.io/styleguide/cppguide.html). +To keep the source consistent, readable, diffable and easy to merge, we use a +fairly rigid coding style, as defined by the +[google-styleguide](https://github.com/google/styleguide) project. All patches +will be expected to conform to the style outlined +[here](https://google.github.io/styleguide/cppguide.html). Use +[.clang-format](https://github.com/google/googletest/blob/master/.clang-format) +to check your formatting -## Requirements for Contributors ### +## Requirements for Contributors -If you plan to contribute a patch, you need to build Google Test, -Google Mock, and their own tests from a git checkout, which has -further requirements: +If you plan to contribute a patch, you need to build Google Test, Google Mock, +and their own tests from a git checkout, which has further requirements: - * [Python](https://www.python.org/) v2.3 or newer (for running some of - the tests and re-generating certain source files from templates) - * [CMake](https://cmake.org/) v2.6.4 or newer - * [GNU Build System](https://en.wikipedia.org/wiki/GNU_Build_System) - including automake (>= 1.9), autoconf (>= 2.59), and - libtool / libtoolize. +* [Python](https://www.python.org/) v2.3 or newer (for running some of the + tests and re-generating certain source files from templates) +* [CMake](https://cmake.org/) v2.6.4 or newer -## Developing Google Test ## +## Developing Google Test and Google Mock -This section discusses how to make your own changes to Google Test. +This section discusses how to make your own changes to the Google Test project. -### Testing Google Test Itself ### +### Testing Google Test and Google Mock Themselves To make sure your changes work as intended and don't break existing -functionality, you'll want to compile and run Google Test's own tests. -For that you can use CMake: +functionality, you'll want to compile and run Google Test and GoogleMock's own +tests. For that you can use CMake: mkdir mybuild cd mybuild - cmake -Dgtest_build_tests=ON ${GTEST_DIR} + cmake -Dgtest_build_tests=ON -Dgmock_build_tests=ON ${GTEST_REPO_DIR} -Make sure you have Python installed, as some of Google Test's tests -are written in Python. If the cmake command complains about not being -able to find Python (`Could NOT find PythonInterp (missing: -PYTHON_EXECUTABLE)`), try telling it explicitly where your Python -executable can be found: +To choose between building only Google Test or Google Mock, you may modify your +cmake command to be one of each - cmake -DPYTHON_EXECUTABLE=path/to/python -Dgtest_build_tests=ON ${GTEST_DIR} + cmake -Dgtest_build_tests=ON ${GTEST_DIR} # sets up Google Test tests + cmake -Dgmock_build_tests=ON ${GMOCK_DIR} # sets up Google Mock tests -Next, you can build Google Test and all of its own tests. On \*nix, -this is usually done by 'make'. To run the tests, do +Make sure you have Python installed, as some of Google Test's tests are written +in Python. If the cmake command complains about not being able to find Python +(`Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)`), try telling it +explicitly where your Python executable can be found: - make test + cmake -DPYTHON_EXECUTABLE=path/to/python ... -All tests should pass. +Next, you can build Google Test and / or Google Mock and all desired tests. On +\*nix, this is usually done by -### Regenerating Source Files ## + make -Some of Google Test's source files are generated from templates (not -in the C++ sense) using a script. -For example, the -file include/gtest/internal/gtest-type-util.h.pump is used to generate -gtest-type-util.h in the same directory. +To run the tests, do -You don't need to worry about regenerating the source files -unless you need to modify them. You would then modify the -corresponding `.pump` files and run the '[pump.py](googletest/scripts/pump.py)' -generator script. See the [Pump Manual](googletest/docs/PumpManual.md). + make test -## Developing Google Mock ### +All tests should pass. -This section discusses how to make your own changes to Google Mock. +### Regenerating Source Files -#### Testing Google Mock Itself #### +Some of Google Test's source files are generated from templates (not in the C++ +sense) using a script. For example, the file +include/gtest/internal/gtest-type-util.h.pump is used to generate +gtest-type-util.h in the same directory. -To make sure your changes work as intended and don't break existing -functionality, you'll want to compile and run Google Test's own tests. -For that you'll need Autotools. First, make sure you have followed -the instructions above to configure Google Mock. -Then, create a build output directory and enter it. Next, - - ${GMOCK_DIR}/configure # try --help for more info - -Once you have successfully configured Google Mock, the build steps are -standard for GNU-style OSS packages. - - make # Standard makefile following GNU conventions - make check # Builds and runs all tests - all should pass. - -Note that when building your project against Google Mock, you are building -against Google Test as well. There is no need to configure Google Test -separately. +You don't need to worry about regenerating the source files unless you need to +modify them. You would then modify the corresponding `.pump` files and run the +'[pump.py](googletest/scripts/pump.py)' generator script. See the +[Pump Manual](googletest/docs/pump_manual.md). Modified: projects/import-googletest-1.10.0/contrib/googletest/README.md ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/README.md Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/README.md Sun Apr 12 03:10:29 2020 (r359817) @@ -1,79 +1,97 @@ +# Google Test -# Google Test # +#### OSS Builds Status: -[](https://travis-ci.org/google/googletest) +[](https://travis-ci.org/google/googletest) [](https://ci.appveyor.com/project/GoogleTestAppVeyor/googletest/branch/master) -**Future Plans**: -* 1.8.x Release - the 1.8.x will be the last release that works with pre-C++11 compilers. The 1.8.x will not accept any requests for any new features and any bugfix requests will only be accepted if proven "critical" -* Post 1.8.x - work to improve/cleanup/pay technical debt. When this work is completed there will be a 1.9.x tagged release -* Post 1.9.x googletest will follow [Abseil Live at Head philosophy](https://abseil.io/about/philosophy) +### Future Plans +#### 1.8.x Release: -Welcome to **Google Test**, Google's C++ test framework! +[the 1.8.x](https://github.com/google/googletest/releases/tag/release-1.8.1) is +the last release that works with pre-C++11 compilers. The 1.8.x will not accept +any requests for any new features and any bugfix requests will only be accepted +if proven "critical" -This repository is a merger of the formerly separate GoogleTest and -GoogleMock projects. These were so closely related that it makes sense to -maintain and release them together. +#### Post 1.8.x: -Please see the project page above for more information as well as the -mailing list for questions, discussions, and development. There is -also an IRC channel on [OFTC](https://webchat.oftc.net/) (irc.oftc.net) #gtest available. Please -join us! +On-going work to improve/cleanup/pay technical debt. When this work is completed +there will be a 1.9.x tagged release -Getting started information for **Google Test** is available in the +#### Post 1.9.x + +Post 1.9.x googletest will follow +[Abseil Live at Head philosophy](https://abseil.io/about/philosophy) + +## Welcome to **Google Test**, Google's C++ test framework! + +This repository is a merger of the formerly separate GoogleTest and GoogleMock +projects. These were so closely related that it makes sense to maintain and +release them together. + +Please subscribe to the mailing list at googletestframework@googlegroups.com for +questions, discussions, and development. + +### Getting started: + +The information for **Google Test** is available in the [Google Test Primer](googletest/docs/primer.md) documentation. **Google Mock** is an extension to Google Test for writing and using C++ mock -classes. See the separate [Google Mock documentation](googlemock/README.md). +classes. See the separate [Google Mock documentation](googlemock/README.md). -More detailed documentation for googletest (including build instructions) are -in its interior [googletest/README.md](googletest/README.md) file. +More detailed documentation for googletest is in its interior +[googletest/README.md](googletest/README.md) file. -## Features ## +## Features - * An [xUnit](https://en.wikipedia.org/wiki/XUnit) test framework. - * Test discovery. - * A rich set of assertions. - * User-defined assertions. - * Death tests. - * Fatal and non-fatal failures. - * Value-parameterized tests. - * Type-parameterized tests. - * Various options for running the tests. - * XML test report generation. +* An [xUnit](https://en.wikipedia.org/wiki/XUnit) test framework. +* Test discovery. +* A rich set of assertions. +* User-defined assertions. +* Death tests. +* Fatal and non-fatal failures. +* Value-parameterized tests. +* Type-parameterized tests. +* Various options for running the tests. +* XML test report generation. -## Platforms ## +## Platforms Google test has been used on a variety of platforms: - * Linux - * Mac OS X - * Windows - * Cygwin - * MinGW - * Windows Mobile - * Symbian +* Linux +* Mac OS X +* Windows +* Cygwin +* MinGW +* Windows Mobile +* Symbian +* PlatformIO -## Who Is Using Google Test? ## +## Who Is Using Google Test? -In addition to many internal projects at Google, Google Test is also used by -the following notable projects: +In addition to many internal projects at Google, Google Test is also used by the +following notable projects: - * The [Chromium projects](http://www.chromium.org/) (behind the Chrome - browser and Chrome OS). - * The [LLVM](http://llvm.org/) compiler. - * [Protocol Buffers](https://github.com/google/protobuf), Google's data +* The [Chromium projects](http://www.chromium.org/) (behind the Chrome browser + and Chrome OS). +* The [LLVM](http://llvm.org/) compiler. +* [Protocol Buffers](https://github.com/google/protobuf), Google's data interchange format. - * The [OpenCV](http://opencv.org/) computer vision library. - * [tiny-dnn](https://github.com/tiny-dnn/tiny-dnn): header only, dependency-free deep learning framework in C++11. +* The [OpenCV](http://opencv.org/) computer vision library. +* [tiny-dnn](https://github.com/tiny-dnn/tiny-dnn): header only, + dependency-free deep learning framework in C++11. -## Related Open Source Projects ## +## Related Open Source Projects -[GTest Runner](https://github.com/nholthaus/gtest-runner) is a Qt5 based automated test-runner and Graphical User Interface with powerful features for Windows and Linux platforms. +[GTest Runner](https://github.com/nholthaus/gtest-runner) is a Qt5 based +automated test-runner and Graphical User Interface with powerful features for +Windows and Linux platforms. -[Google Test UI](https://github.com/ospector/gtest-gbar) is test runner that runs -your test binary, allows you to track its progress via a progress bar, and +[Google Test UI](https://github.com/ospector/gtest-gbar) is test runner that +runs your test binary, allows you to track its progress via a progress bar, and displays a list of test failures. Clicking on one shows failure text. Google Test UI is written in C#. @@ -85,46 +103,32 @@ result output. If your test runner understands TAP, yo [gtest-parallel](https://github.com/google/gtest-parallel) is a test runner that runs tests from your binary in parallel to provide significant speed-up. -[GoogleTest Adapter](https://marketplace.visualstudio.com/items?itemName=DavidSchuldenfrei.gtest-adapter) is a VS Code extension allowing to view Google Tests in a tree view, and run/debug your tests. +[GoogleTest Adapter](https://marketplace.visualstudio.com/items?itemName=DavidSchuldenfrei.gtest-adapter) +is a VS Code extension allowing to view Google Tests in a tree view, and +run/debug your tests. -## Requirements ## +## Requirements -Google Test is designed to have fairly minimal requirements to build -and use with your projects, but there are some. Currently, we support -Linux, Windows, Mac OS X, and Cygwin. We will also make our best -effort to support other platforms (e.g. Solaris, AIX, and z/OS). -However, since core members of the Google Test project have no access -to these platforms, Google Test may have outstanding issues there. If -you notice any problems on your platform, please notify -[googletestframework@googlegroups.com](https://groups.google.com/forum/#!forum/googletestframework). Patches for fixing them are -even more welcome! +Google Test is designed to have fairly minimal requirements to build and use +with your projects, but there are some. If you notice any problems on your +platform, please notify +[googletestframework@googlegroups.com](https://groups.google.com/forum/#!forum/googletestframework). +Patches for fixing them are welcome! -### Linux Requirements ### +### Build Requirements These are the base requirements to build and use Google Test from a source -package (as described below): +package: - * GNU-compatible Make or gmake - * POSIX-standard shell - * POSIX(-2) Regular Expressions (regex.h) - * A C++98-standard-compliant compiler +* [Bazel](https://bazel.build/) or [CMake](https://cmake.org/). NOTE: Bazel is + the build system that googletest is using internally and tests against. + CMake is community-supported. -### Windows Requirements ### +* a C++11-standard-compliant compiler - * Microsoft Visual C++ 2015 or newer - -### Cygwin Requirements ### - - * Cygwin v1.5.25-14 or newer - -### Mac OS X Requirements ### - - * Mac OS X v10.4 Tiger or newer - * Xcode Developer Tools - ## Contributing change -Please read the [`CONTRIBUTING.md`](CONTRIBUTING.md) for details on -how to contribute to this project. +Please read the [`CONTRIBUTING.md`](CONTRIBUTING.md) for details on how to +contribute to this project. Happy testing! Modified: projects/import-googletest-1.10.0/contrib/googletest/WORKSPACE ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/WORKSPACE Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/WORKSPACE Sun Apr 12 03:10:29 2020 (r359817) @@ -1,8 +1,23 @@ workspace(name = "com_google_googletest") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + # Abseil http_archive( name = "com_google_absl", urls = ["https://github.com/abseil/abseil-cpp/archive/master.zip"], strip_prefix = "abseil-cpp-master", ) + +http_archive( + name = "rules_cc", + strip_prefix = "rules_cc-master", + urls = ["https://github.com/bazelbuild/rules_cc/archive/master.zip"], +) + +http_archive( + name = "rules_python", + strip_prefix = "rules_python-master", + urls = ["https://github.com/bazelbuild/rules_python/archive/master.zip"], +) + Modified: projects/import-googletest-1.10.0/contrib/googletest/appveyor.yml ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/appveyor.yml Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/appveyor.yml Sun Apr 12 03:10:29 2020 (r359817) @@ -6,27 +6,34 @@ environment: matrix: - compiler: msvc-15-seh generator: "Visual Studio 15 2017" + build_system: cmake APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - compiler: msvc-15-seh generator: "Visual Studio 15 2017 Win64" + build_system: cmake APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 enabled_on_pr: yes + - compiler: msvc-15-seh + build_system: bazel + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + enabled_on_pr: yes + - compiler: msvc-14-seh + build_system: cmake generator: "Visual Studio 14 2015" enabled_on_pr: yes - compiler: msvc-14-seh + build_system: cmake generator: "Visual Studio 14 2015 Win64" - - compiler: gcc-5.3.0-posix - generator: "MinGW Makefiles" - cxx_path: 'C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin' - - compiler: gcc-6.3.0-posix + build_system: cmake generator: "MinGW Makefiles" cxx_path: 'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin' + enabled_on_pr: yes configuration: - Debug @@ -38,6 +45,8 @@ install: - ps: | Write-Output "Compiler: $env:compiler" Write-Output "Generator: $env:generator" + Write-Output "Env:Configuation: $env:configuration" + Write-Output "Env: $env" if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) { Write-Output "This is *NOT* a pull request build" } else { @@ -47,20 +56,44 @@ install: } } - # git bash conflicts with MinGW makefiles - if ($env:generator -eq "MinGW Makefiles") { - $env:path = $env:path.replace("C:\Program Files\Git\usr\bin;", "") - if ($env:cxx_path -ne "") { - $env:path += ";$env:cxx_path" + # install Bazel + if ($env:build_system -eq "bazel") { + appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.28.1/bazel-0.28.1-windows-x86_64.exe -FileName bazel.exe + } + + if ($env:build_system -eq "cmake") { + # git bash conflicts with MinGW makefiles + if ($env:generator -eq "MinGW Makefiles") { + $env:path = $env:path.replace("C:\Program Files\Git\usr\bin;", "") + if ($env:cxx_path -ne "") { + $env:path += ";$env:cxx_path" + } } } +before_build: +- ps: | + $env:root=$env:APPVEYOR_BUILD_FOLDER + Write-Output "env:root: $env:root" + build_script: - ps: | # Only enable some builds for pull requests, the AppVeyor queue is too long. if ((Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) -And (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "yes")) { return + } else { + # special case - build with Bazel + if ($env:build_system -eq "bazel") { + & $env:root\bazel.exe build -c opt //:gtest_samples + if ($LastExitCode -eq 0) { # bazel writes to StdErr and PowerShell interprets it as an error + $host.SetShouldExit(0) + } else { # a real error + throw "Exec: $ErrorMessage" + } + return + } } + # by default build with CMake md _build -Force | Out-Null cd _build @@ -89,16 +122,33 @@ test_script: if ((Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) -And (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "yes")) { return } - if ($env:generator -eq "MinGW Makefiles") { - return # No test available for MinGW + if ($env:build_system -eq "bazel") { + # special case - testing with Bazel + & $env:root\bazel.exe test //:gtest_samples + if ($LastExitCode -eq 0) { # bazel writes to StdErr and PowerShell interprets it as an error + $host.SetShouldExit(0) + } else { # a real error + throw "Exec: $ErrorMessage" + } } - & ctest -C $env:configuration --timeout 600 --output-on-failure - if ($LastExitCode -ne 0) { - throw "Exec: $ErrorMessage" + if ($env:build_system -eq "cmake") { + # built with CMake - test with CTest + if ($env:generator -eq "MinGW Makefiles") { + return # No test available for MinGW + } + + & ctest -C $env:configuration --timeout 600 --output-on-failure + if ($LastExitCode -ne 0) { + throw "Exec: $ErrorMessage" + } } artifacts: - path: '_build/CMakeFiles/*.log' name: logs - path: '_build/Testing/**/*.xml' + name: test_results + - path: 'bazel-testlogs/**/test.log' + name: test_logs + - path: 'bazel-testlogs/**/test.xml' name: test_results Modified: projects/import-googletest-1.10.0/contrib/googletest/ci/build-linux-bazel.sh ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/ci/build-linux-bazel.sh Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/ci/build-linux-bazel.sh Sun Apr 12 03:10:29 2020 (r359817) @@ -31,6 +31,7 @@ set -e +bazel version bazel build --curses=no //...:all bazel test --curses=no //...:all bazel test --curses=no //...:all --define absl=1 Copied: projects/import-googletest-1.10.0/contrib/googletest/ci/build-platformio.sh (from r359816, vendor/google/googletest/dist/ci/build-platformio.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.10.0/contrib/googletest/ci/build-platformio.sh Sun Apr 12 03:10:29 2020 (r359817, copy of r359816, vendor/google/googletest/dist/ci/build-platformio.sh) @@ -0,0 +1,2 @@ +# run PlatformIO builds +platformio run Modified: projects/import-googletest-1.10.0/contrib/googletest/ci/env-osx.sh ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/ci/env-osx.sh Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/ci/env-osx.sh Sun Apr 12 03:10:29 2020 (r359817) @@ -34,7 +34,14 @@ # # TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}. +# -if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi +if [ "${TRAVIS_OS_NAME}" = "osx" ]; then + if [ "$CXX" = "clang++" ]; then + # $PATH needs to be adjusted because the llvm tap doesn't install the + # package to /usr/local/bin, etc, like the gcc tap does. + # See: https://github.com/Homebrew/legacy-homebrew/issues/29733 + clang_version=3.9 + export PATH="/usr/local/opt/llvm@${clang_version}/bin:$PATH"; + fi fi Modified: projects/import-googletest-1.10.0/contrib/googletest/ci/install-osx.sh ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/ci/install-osx.sh Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/ci/install-osx.sh Sun Apr 12 03:10:29 2020 (r359817) @@ -36,4 +36,5 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then exit 0 fi -brew install ccache +brew update +brew install ccache gcc@4.9 Copied: projects/import-googletest-1.10.0/contrib/googletest/ci/install-platformio.sh (from r359816, vendor/google/googletest/dist/ci/install-platformio.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.10.0/contrib/googletest/ci/install-platformio.sh Sun Apr 12 03:10:29 2020 (r359817, copy of r359816, vendor/google/googletest/dist/ci/install-platformio.sh) @@ -0,0 +1,5 @@ +# install PlatformIO +sudo pip install -U platformio + +# update PlatformIO +platformio update Modified: projects/import-googletest-1.10.0/contrib/googletest/googlemock/CMakeLists.txt ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/googlemock/CMakeLists.txt Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/googlemock/CMakeLists.txt Sun Apr 12 03:10:29 2020 (r359817) @@ -1,4 +1,7 @@ ######################################################################## +# Note: CMake support is community-based. The maintainers do not use CMake +# internally. +# # CMake build script for Google Mock. # # To run the tests for Google Mock itself on Linux, use 'make test' or @@ -49,7 +52,7 @@ endif() # targets to the current scope. We are placing Google Test's binary # directory in a subdirectory of our own as VC compilation may break # if they are the same (the default). -add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/gtest") +add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/${gtest_dir}") # These commands only run if this is the main project @@ -75,18 +78,6 @@ set(gmock_build_include_dirs "${gtest_SOURCE_DIR}") include_directories(${gmock_build_include_dirs}) -# Summary of tuple support for Microsoft Visual Studio: -# Compiler version(MS) version(cmake) Support -# ---------- ----------- -------------- ----------------------------- -# <= VS 2010 <= 10 <= 1600 Use Google Tests's own tuple. -# VS 2012 11 1700 std::tr1::tuple + _VARIADIC_MAX=10 -# VS 2013 12 1800 std::tr1::tuple -# VS 2015 14 1900 std::tuple -# VS 2017 15 >= 1910 std::tuple -if (MSVC AND MSVC_VERSION EQUAL 1700) - add_definitions(/D _VARIADIC_MAX=10) -endif() - ######################################################################## # # Defines the gmock & gmock_main libraries. User tests should link @@ -145,15 +136,37 @@ if (gmock_build_tests) # 'make test' or ctest. enable_testing() + if (WIN32) + file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/RunTest.ps1" + CONTENT +"$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\" +$env:Path = \"$project_bin;$env:Path\" +& $args") + elseif (MINGW OR CYGWIN) + file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1" + CONTENT +"$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin) +$env:Path = \"$project_bin;$env:Path\" +& $args") + endif() + + if (MINGW OR CYGWIN) + if (CMAKE_VERSION VERSION_LESS "2.8.12") + add_compile_options("-Wa,-mbig-obj") + else() + add_definitions("-Wa,-mbig-obj") + endif() + endif() + ############################################################ # C++ tests built with standard compiler flags. cxx_test(gmock-actions_test gmock_main) cxx_test(gmock-cardinalities_test gmock_main) cxx_test(gmock_ex_test gmock_main) + cxx_test(gmock-function-mocker_test gmock_main) cxx_test(gmock-generated-actions_test gmock_main) cxx_test(gmock-generated-function-mockers_test gmock_main) - cxx_test(gmock-generated-internal-utils_test gmock_main) cxx_test(gmock-generated-matchers_test gmock_main) cxx_test(gmock-internal-utils_test gmock_main) cxx_test(gmock-matchers_test gmock_main) @@ -182,25 +195,12 @@ if (gmock_build_tests) cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) - if (MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010. - # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that - # conflict with our own definitions. Therefore using our own tuple does not - # work on those compilers. - cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" - "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) - - cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}" - gmock_main_use_own_tuple test/gmock-spec-builders_test.cc) - endif() else() cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc) target_link_libraries(gmock_main_no_exception PUBLIC gmock) cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc) target_link_libraries(gmock_main_no_rtti PUBLIC gmock) - - cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" src/gmock_main.cc) - target_link_libraries(gmock_main_use_own_tuple PUBLIC gmock) endif() cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}" gmock_main_no_exception test/gmock-more-actions_test.cc) Modified: projects/import-googletest-1.10.0/contrib/googletest/googlemock/README.md ============================================================================== --- projects/import-googletest-1.10.0/contrib/googletest/googlemock/README.md Sun Apr 12 02:46:56 2020 (r359816) +++ projects/import-googletest-1.10.0/contrib/googletest/googlemock/README.md Sun Apr 12 03:10:29 2020 (r359817) @@ -1,323 +1,44 @@ -## Google Mock ## +# Googletest Mocking (gMock) Framework -The Google C++ mocking framework. +### Overview -### Overview ### +Google's framework for writing and using C++ mock classes. It can help you +derive better designs of your system and write better tests. -Google's framework for writing and using C++ mock classes. -It can help you derive better designs of your system and write better tests. - It is inspired by: - * [jMock](http://www.jmock.org/), - * [EasyMock](http://www.easymock.org/), and - * [Hamcrest](http://code.google.com/p/hamcrest/), +* [jMock](http://www.jmock.org/), +* [EasyMock](http://www.easymock.org/), and *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
](https://travis-ci.org/google/googletest){kind=link}
](https://travis-ci.org/google/googletest){kind=link}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004120310.03C3AT5G097180>