Skip to content

Commit

Permalink
Updated third_party/ and Travis CI config. (google#48)
Browse files Browse the repository at this point in the history
  • Loading branch information
pwnall committed Dec 14, 2020
1 parent 1f85030 commit a3d9e6d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

language: cpp
dist: bionic
osx_image: xcode10.3
osx_image: xcode11.3

compiler:
- gcc
Expand All @@ -28,16 +28,16 @@ addons:
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- sourceline: 'ppa:ubuntu-toolchain-r/test'
packages:
- clang-9
- clang-10
- cmake
- gcc-9
- g++-9
- gcc-10
- g++-10
- ninja-build
homebrew:
packages:
- cmake
- gcc@9
- llvm@9
- gcc@10
- llvm@10
- ninja
update: true

Expand All @@ -48,14 +48,14 @@ install:
export PATH="$(brew --prefix llvm)/bin:$PATH";
fi
# /usr/bin/gcc points to an older compiler on both Linux and macOS.
- if [ "$CXX" = "g++" ]; then export CXX="g++-9" CC="gcc-9"; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-10" CC="gcc-10"; fi
# /usr/bin/clang points to an older compiler on both Linux and macOS.
#
# Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
# below don't work on macOS. Fortunately, the path change above makes the
# default values (clang and clang++) resolve to the correct compiler on macOS.
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
if [ "$CXX" = "clang++" ]; then export CXX="clang++-9" CC="clang-9"; fi;
if [ "$CXX" = "clang++" ]; then export CXX="clang++-10" CC="clang-10"; fi;
fi
- echo ${CC}
- echo ${CXX}
Expand Down
2 changes: 1 addition & 1 deletion third_party/benchmark
Submodule benchmark updated 53 files
+38 −0 .github/workflows/build-and-test.yml
+26 −0 .github/workflows/pylint.yml
+24 −0 .github/workflows/test_bindings.yml
+4 −0 .gitignore
+2 −2 .travis.yml
+2 −0 AUTHORS
+2 −2 BUILD.bazel
+11 −3 CMakeLists.txt
+5 −0 CONTRIBUTORS
+43 −20 README.md
+36 −0 WORKSPACE
+3 −0 bindings/python/BUILD
+25 −0 bindings/python/build_defs.bzl
+38 −0 bindings/python/google_benchmark/BUILD
+156 −0 bindings/python/google_benchmark/__init__.py
+180 −0 bindings/python/google_benchmark/benchmark.cc
+136 −0 bindings/python/google_benchmark/example.py
+20 −0 bindings/python/pybind11.BUILD
+6 −0 bindings/python/python_headers.BUILD
+2 −0 bindings/python/requirements.txt
+5 −0 cmake/CXXFeatureCheck.cmake
+1 −1 cmake/GoogleTest.cmake.in
+2 −2 cmake/benchmark.pc.in
+0 −0 docs/releasing.md
+5 −1 docs/tools.md
+25 −10 include/benchmark/benchmark.h
+0 −320 mingw.py
+2 −0 requirements.txt
+140 −0 setup.py
+2 −2 src/benchmark.cc
+26 −17 src/benchmark_register.cc
+2 −1 src/benchmark_register.h
+1 −1 src/commandlineflags.cc
+19 −14 src/cycleclock.h
+9 −1 src/internal_macros.h
+4 −2 src/json_reporter.cc
+1 −1 src/reporter.cc
+16 −0 src/sleep.cc
+3 −0 src/string_util.cc
+18 −10 src/sysinfo.cc
+50 −22 src/timers.cc
+3 −0 test/CMakeLists.txt
+77 −0 test/args_product_test.cc
+6 −0 test/benchmark_gtest.cc
+72 −72 test/commandlineflags_gtest.cc
+8 −6 test/fixture_test.cc
+2 −2 test/output_test_helper.cc
+2 −3 test/reporter_output_test.cc
+19 −0 tools/BUILD.bazel
+25 −4 tools/compare.py
+491 −129 tools/gbench/report.py
+2 −3 tools/gbench/util.py
+1 −0 tools/requirements.txt
2 changes: 1 addition & 1 deletion third_party/glog
Submodule glog updated 75 files
+8 −0 .bazelci/presubmit.yml
+8 −8 .gitignore
+1 −0 AUTHORS
+213 −46 CMakeLists.txt
+0 −58 CONTRIBUTING.md
+3 −0 CONTRIBUTORS
+0 −297 INSTALL
+0 −260 Makefile.am
+0 −10 README.md
+800 −0 README.rst
+0 −5 autogen.sh
+175 −104 bazel/glog.bzl
+0 −0 cmake/DetermineGflagsNamespace.cmake
+78 −0 cmake/FindUnwind.cmake
+63 −0 cmake/GetCacheVariables.cmake
+0 −81 cmake/INSTALL.md
+12 −0 cmake/TestInitPackageConfig.cmake
+33 −0 cmake/TestPackageConfig.cmake
+0 −246 configure.ac
+0 −115 doc/designstyle.css
+0 −613 doc/glog.html
+3 −1 glog-config.cmake.in
+18 −0 glog-modules.cmake.in
+0 −16 m4/ac_have_attribute.m4
+0 −14 m4/ac_have_builtin_expect.m4
+0 −14 m4/ac_have_sync_val_compare_and_swap.m4
+0 −31 m4/ac_rwlock.m4
+0 −363 m4/acx_pthread.m4
+0 −36 m4/google_namespace.m4
+0 −123 m4/ltsugar.m4
+0 −98 m4/lt~obsolete.m4
+0 −15 m4/namespaces.m4
+0 −71 m4/pc_from_ucontext.m4
+0 −25 m4/stl_namespace.m4
+0 −15 m4/using_operator.m4
+0 −73 packages/deb.sh
+0 −7 packages/deb/README
+0 −71 packages/deb/changelog
+0 −1 packages/deb/compat
+0 −23 packages/deb/control
+0 −35 packages/deb/copyright
+0 −7 packages/deb/docs
+0 −4 packages/deb/libgoogle-glog-dev.dirs
+0 −10 packages/deb/libgoogle-glog-dev.install
+0 −1 packages/deb/libgoogle-glog0.dirs
+0 −2 packages/deb/libgoogle-glog0.install
+0 −117 packages/deb/rules
+0 −75 packages/rpm.sh
+0 −72 packages/rpm/rpm.spec
+7 −1 src/config.h.cmake.in
+15 −0 src/glog/log_severity.h
+36 −4 src/glog/logging.h.in
+2 −2 src/glog/raw_logging.h.in
+4 −11 src/glog/vlog_is_on.h.in
+17 −11 src/googletest.h
+355 −38 src/logging.cc
+131 −10 src/logging_unittest.cc
+305 −305 src/logging_unittest.err
+8 −0 src/package_config_unittest/working_config/CMakeLists.txt
+6 −0 src/package_config_unittest/working_config/glog_package_config.cc
+1 −1 src/raw_logging.cc
+6 −3 src/stacktrace_libunwind-inl.h
+1 −1 src/stacktrace_powerpc-inl.h
+1 −1 src/stacktrace_windows-inl.h
+3 −2 src/stl_logging_unittest.cc
+24 −8 src/symbolize.cc
+1 −1 src/symbolize_unittest.cc
+4 −14 src/utilities.cc
+0 −2 src/utilities.h
+0 −2 src/vlog_is_on.cc
+1,160 −0 src/windows/dirent.h
+30 −3 src/windows/glog/logging.h
+4 −11 src/windows/glog/vlog_is_on.h
+6 −0 src/windows/port.cc
+4 −0 src/windows/port.h
2 changes: 1 addition & 1 deletion third_party/googletest
Submodule googletest updated 99 files
+13 −21 .travis.yml
+3 −0 BUILD.bazel
+1 −1 CMakeLists.txt
+1 −1 CONTRIBUTING.md
+52 −53 README.md
+18 −11 WORKSPACE
+1 −1 appveyor.yml
+0 −1 ci/build-linux-bazel.sh
+2 −2 ci/env-linux.sh
+5 −11 ci/env-osx.sh
+1 −1 ci/install-linux.sh
+1 −2 ci/install-osx.sh
+0 −4 ci/log-config.sh
+5 −20 ci/travis.sh
+2 −15 googlemock/CMakeLists.txt
+21 −21 googlemock/README.md
+1 −1 googlemock/cmake/gmock.pc.in
+1 −1 googlemock/cmake/gmock_main.pc.in
+55 −45 googlemock/docs/cheat_sheet.md
+9 −0 googlemock/docs/community_created_documentation.md
+60 −55 googlemock/docs/cook_book.md
+23 −21 googlemock/docs/for_dummies.md
+3 −1 googlemock/docs/gmock_faq.md
+3 −1 googlemock/docs/pump_manual.md
+279 −158 googlemock/include/gmock/gmock-actions.h
+51 −30 googlemock/include/gmock/gmock-function-mocker.h
+115 −225 googlemock/include/gmock/gmock-generated-actions.h
+111 −97 googlemock/include/gmock/gmock-generated-actions.h.pump
+539 −127 googlemock/include/gmock/gmock-matchers.h
+0 −162 googlemock/include/gmock/gmock-more-actions.h
+52 −37 googlemock/include/gmock/gmock-nice-strict.h
+4 −5 googlemock/include/gmock/gmock-spec-builders.h
+0 −1 googlemock/include/gmock/gmock.h
+8 −19 googlemock/include/gmock/internal/gmock-internal-utils.h
+3 −3 googlemock/include/gmock/internal/gmock-pp.h
+73 −56 googlemock/scripts/fuse_gmock_files.py
+3 −4 googlemock/scripts/generator/cpp/ast.py
+4 −4 googlemock/scripts/generator/cpp/gmock_class_test.py
+0 −2 googlemock/src/gmock-matchers.cc
+38 −22 googlemock/src/gmock-spec-builders.cc
+1 −1 googlemock/src/gmock.cc
+3 −0 googlemock/test/BUILD.bazel
+97 −32 googlemock/test/gmock-actions_test.cc
+66 −0 googlemock/test/gmock-function-mocker_test.cc
+27 −55 googlemock/test/gmock-generated-actions_test.cc
+0 −1,321 googlemock/test/gmock-generated-matchers_test.cc
+0 −14 googlemock/test/gmock-internal-utils_test.cc
+1,639 −15 googlemock/test/gmock-matchers_test.cc
+31 −4 googlemock/test/gmock-more-actions_test.cc
+0 −1 googlemock/test/gmock_all_test.cc
+1 −1 googlemock/test/gmock_output_test_golden.txt
+5 −14 googletest/CMakeLists.txt
+54 −36 googletest/README.md
+1 −1 googletest/cmake/gtest_main.pc.in
+20 −37 googletest/cmake/internal_utils.cmake
+120 −80 googletest/docs/advanced.md
+23 −5 googletest/docs/faq.md
+2 −0 googletest/docs/pkgconfig.md
+5 −1 googletest/docs/primer.md
+2 −3 googletest/include/gtest/gtest-death-test.h
+12 −6 googletest/include/gtest/gtest-matchers.h
+2 −1 googletest/include/gtest/gtest-param-test.h
+119 −48 googletest/include/gtest/gtest-printers.h
+8 −4 googletest/include/gtest/gtest.h
+190 −60 googletest/include/gtest/internal/gtest-internal.h
+23 −10 googletest/include/gtest/internal/gtest-param-util.h
+1 −0 googletest/include/gtest/internal/gtest-port-arch.h
+111 −7 googletest/include/gtest/internal/gtest-port.h
+3 −0 googletest/include/gtest/internal/gtest-string.h
+21 −17 googletest/include/gtest/internal/gtest-type-util.h
+21 −30 googletest/src/gtest-death-test.cc
+10 −24 googletest/src/gtest-filepath.cc
+10 −4 googletest/src/gtest-internal-inl.h
+4 −3 googletest/src/gtest-port.cc
+6 −0 googletest/src/gtest-printers.cc
+1 −11 googletest/src/gtest-typed-test.cc
+302 −142 googletest/src/gtest.cc
+2 −0 googletest/test/BUILD.bazel
+24 −0 googletest/test/googletest-death-test-test.cc
+1 −1 googletest/test/googletest-death-test_ex_test.cc
+1 −0 googletest/test/googletest-env-var-test.py
+5 −0 googletest/test/googletest-env-var-test_.cc
+30 −4 googletest/test/googletest-json-output-unittest.py
+25 −13 googletest/test/googletest-output-test-golden-lin.txt
+6 −5 googletest/test/googletest-param-test-test.cc
+12 −4 googletest/test/googletest-port-test.cc
+236 −10 googletest/test/googletest-printers-test.cc
+1 −1 googletest/test/googletest-shuffle-test_.cc
+4 −4 googletest/test/gtest-typed-test_test.cc
+4 −4 googletest/test/gtest-unittest-api_test.cc
+1 −0 googletest/test/gtest_help_test.py
+150 −5 googletest/test/gtest_list_output_unittest.py
+30 −0 googletest/test/gtest_list_output_unittest_.cc
+1 −3 googletest/test/gtest_test_utils.py
+353 −50 googletest/test/gtest_unittest.cc
+2 −2 googletest/test/gtest_xml_outfiles_test.py
+39 −23 googletest/test/gtest_xml_output_unittest.py
+9 −0 googletest/test/gtest_xml_output_unittest_.cc
+3 −2 googletest/test/gtest_xml_test_utils.py

0 comments on commit a3d9e6d

Please sign in to comment.