diff options
| author | Enji Cooper <yaneurabeya@gmail.com> | 2019-01-12 17:16:29 -0800 |
|---|---|---|
| committer | Enji Cooper <yaneurabeya@gmail.com> | 2019-02-04 12:19:27 -0800 |
| commit | 9df5475b8267e3b6e485bcb55febd208149e96af (patch) | |
| tree | 292140dc6409f8972678a801d37ce65e5054482a /.travis.yml | |
| parent | 0ea2d8f8fa1601abb9ce713b7414e7b86f90bc61 (diff) | |
| download | googletest-9df5475b8267e3b6e485bcb55febd208149e96af.tar.gz googletest-9df5475b8267e3b6e485bcb55febd208149e96af.tar.bz2 googletest-9df5475b8267e3b6e485bcb55febd208149e96af.zip | |
Test out changes with clang/OSX each PR using Travis CI
This will help ensure that test coverage isn't missed when changes that
can impact OSX with clang are submitted. Although not perfect, testing
changes on OSX with clang is an ok proxy [for now] for testing changes on
FreeBSD with clang (testing on FreeBSD is non-trivial, as Travis CI doesn't
support operating systems other than Linux and OSX).
In order to support this, install the packages via homebrew using a
`addons::homebrew::packages` block (similar to `addons::apt::packages`
for Ubuntu), as documented in the Travis CI docs
( https://docs.travis-ci.com/user/installing-dependencies/ ). While
here, try pushing apt* calls into the Travis config for Ubuntu, instead
of delaying the equivalent calls in the `ci/*.sh` scripts. Keep the
`ci/*.sh` scripts for ease of testing locally (and extend the OSX one to
install gcc 4.9 and llvm 3.9, like the travis config does).
In order to accomodate this change (and because the homebrew package for
llvm@3.9 doesn't automatically add clang*-3.9 to `$PATH`), `$PATH` needs
to be adjusted to find the llvm@3.9 toolchain.
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3c52e78c..0399380d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,8 @@ matrix: compiler: gcc env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp - os: osx + compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp - if: type != pull_request # These are the install and build (script) phases for the most common entries in the matrix. They could be included # in each entry in the matrix, but that is just repetitive. @@ -73,6 +73,13 @@ addons: packages: - g++-4.9 - clang-3.9 + update: true + homebrew: + packages: + - ccache + - gcc@4.9 + - llvm@3.9 + update: true notifications: email: false |