summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/googletest/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/googletest/.travis.yml')
-rw-r--r--3rdparty/googletest/.travis.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/3rdparty/googletest/.travis.yml b/3rdparty/googletest/.travis.yml
index 90002648a5c..3204dfac17d 100644
--- a/3rdparty/googletest/.travis.yml
+++ b/3rdparty/googletest/.travis.yml
@@ -2,29 +2,29 @@
# http://about.travis-ci.org/docs/user/build-configuration/
# This file can be validated on:
# http://lint.travis-ci.org/
-# See also
-# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
-# to allow C++11, though we are not yet building with -std=c++11
install:
# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
-# /usr/bin/clang is our version already, and clang-X.Y does not exist.
-#- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+# /usr/bin/clang is 3.4, lets override with modern one.
+- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
- echo ${PATH}
-- ls /usr/local
-- ls /usr/local/bin
-- export PATH=/usr/local/bin:/usr/bin:${PATH}
- echo ${CXX}
- ${CXX} --version
+- ${CXX} -v
addons:
apt:
+ # List of whitelisted in travis packages for ubuntu-precise can be found here:
+ # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+ # List of whitelisted in travis apt-sources:
+ # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
sources:
- ubuntu-toolchain-r-test
+ - llvm-toolchain-precise-3.7
packages:
- gcc-4.9
- g++-4.9
- - clang
+ - clang-3.7
- valgrind
os:
- linux