Googletest export

Restore https://github.com/google/googletest/pull/2309 that got overwritten

PiperOrigin-RevId: 261759571
This commit is contained in:
misterg 2019-08-05 16:42:55 -04:00 committed by Gennadiy Civil
parent 11be5f534c
commit 9f8c3934d5

View File

@ -3,7 +3,6 @@
# This file can be validated on: # This file can be validated on:
# http://lint.travis-ci.org/ # http://lint.travis-ci.org/
sudo: false
language: cpp language: cpp
# Define the matrix explicitly, manually expanding the combinations of (os, compiler, env). # Define the matrix explicitly, manually expanding the combinations of (os, compiler, env).
@ -11,20 +10,17 @@ language: cpp
matrix: matrix:
include: include:
- os: linux - os: linux
sudo: required
before_install: chmod -R +x ./ci/*platformio.sh before_install: chmod -R +x ./ci/*platformio.sh
install: ./ci/install-platformio.sh install: ./ci/install-platformio.sh
script: ./ci/build-platformio.sh script: ./ci/build-platformio.sh
- os: linux - os: linux
dist: xenial dist: xenial
compiler: gcc compiler: gcc
sudo : true
install: ./ci/install-linux.sh && ./ci/log-config.sh install: ./ci/install-linux.sh && ./ci/log-config.sh
script: ./ci/build-linux-bazel.sh script: ./ci/build-linux-bazel.sh
- os: linux - os: linux
dist: xenial dist: xenial
compiler: clang compiler: clang
sudo : true
install: ./ci/install-linux.sh && ./ci/log-config.sh install: ./ci/install-linux.sh && ./ci/log-config.sh
script: ./ci/build-linux-bazel.sh script: ./ci/build-linux-bazel.sh
- os: linux - os: linux
@ -52,7 +48,7 @@ install:
script: ./ci/travis.sh script: ./ci/travis.sh
# For sudo=false builds this section installs the necessary dependencies. # This section installs the necessary dependencies.
addons: addons:
apt: apt:
# List of whitelisted in travis packages for ubuntu-precise can be found here: # List of whitelisted in travis packages for ubuntu-precise can be found here: