diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2020-04-09 01:55:35 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2020-04-09 01:55:35 +0000 |
commit | cd024ff37bc5950173e4c7f34f7259d85825e810 (patch) | |
tree | 24e26b52391d78c7c7b65168aca8f803fde926b1 /ci | |
parent | 83481c8c5c0cd0b3fc86f39b2985efd4e300200a (diff) |
Import GoogleTest 1.10.0vendor/google/googletest/1.10.0
GoogleTest 1.10.0 is the last official release series planned for GoogleTest.
After 1.10.x, Google is switching GoogleTest to a "release on master" model,
as documented here: https://abseil.io/about/philosophy .
More information about what's captured between releases can be found on the
GitHub release page: https://github.com/google/googletest/releases .
Notes
Notes:
svn path=/vendor/google/googletest/dist/; revision=359732
svn path=/vendor/google/googletest/1.10.0/; revision=359733; tag=vendor/google/googletest/1.10.0
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/build-linux-autotools.sh | 44 | ||||
-rwxr-xr-x | ci/build-linux-bazel.sh | 1 | ||||
-rwxr-xr-x | ci/build-platformio.sh | 2 | ||||
-rwxr-xr-x | ci/env-osx.sh | 11 | ||||
-rwxr-xr-x | ci/install-osx.sh | 3 | ||||
-rwxr-xr-x | ci/install-platformio.sh | 5 |
6 files changed, 19 insertions, 47 deletions
diff --git a/ci/build-linux-autotools.sh b/ci/build-linux-autotools.sh deleted file mode 100755 index cc404e9b242c..000000000000 --- a/ci/build-linux-autotools.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2017 Google Inc. -# 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 -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -set -e - -. ci/get-nprocessors.sh - -# Create the configuration script -autoreconf -i - -# Run in a subdirectory to keep the sources clean -mkdir build || true -cd build -../configure - -make -j ${NPROCESSORS:-2} diff --git a/ci/build-linux-bazel.sh b/ci/build-linux-bazel.sh index 3f1c78495511..ae8fb75816f9 100755 --- a/ci/build-linux-bazel.sh +++ b/ci/build-linux-bazel.sh @@ -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 diff --git a/ci/build-platformio.sh b/ci/build-platformio.sh new file mode 100755 index 000000000000..1d7658d8738b --- /dev/null +++ b/ci/build-platformio.sh @@ -0,0 +1,2 @@ +# run PlatformIO builds +platformio run diff --git a/ci/env-osx.sh b/ci/env-osx.sh index 127a969b957f..9c421e14314c 100755 --- a/ci/env-osx.sh +++ b/ci/env-osx.sh @@ -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 diff --git a/ci/install-osx.sh b/ci/install-osx.sh index 6550ff514f22..cc4750829ce5 100755 --- a/ci/install-osx.sh +++ b/ci/install-osx.sh @@ -36,4 +36,5 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then exit 0 fi -brew install ccache +brew update +brew install ccache gcc@4.9 diff --git a/ci/install-platformio.sh b/ci/install-platformio.sh new file mode 100755 index 000000000000..4d7860a560c9 --- /dev/null +++ b/ci/install-platformio.sh @@ -0,0 +1,5 @@ +# install PlatformIO +sudo pip install -U platformio + +# update PlatformIO +platformio update |