aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2015-10-17 14:22:07 +0200
committerEven Rouault <even.rouault@spatialys.com>2015-10-17 14:22:07 +0200
commit46110afd85de4e43c435100c0c21b5990e96598c (patch)
treeaf942fc6c3afb7b0a3c783b6a7a9d8cce90888e9
parent90e393396d0aad7f504b21bc25f87326d044da63 (diff)
parent4cba4312fed9318bc5f50a9d278f7fc77d19aff0 (diff)
downloadPROJ-46110afd85de4e43c435100c0c21b5990e96598c.tar.gz
PROJ-46110afd85de4e43c435100c0c21b5990e96598c.zip
Merge remote branch 'QuLogic/travis-osx'
-rw-r--r--.travis.yml15
1 files changed, 14 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 45294a86..b7d6dc68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,15 @@ compiler:
- gcc
- clang
+os:
+ - linux
+ - osx
+
+matrix:
+ exclude:
+ - os: osx
+ compiler: gcc
+
before_install:
- pip install --user cpp-coveralls
@@ -81,7 +90,11 @@ install:
- PROJ_LIB=../nad src/multistresstest
- cd ..
# autoconf build with grids and coverage
- - CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure
+ - if [ $TRAVIS_OS_NAME == "osx" ]; then
+ CFLAGS="--coverage" ./configure;
+ else
+ CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure;
+ fi
- make -j3
- make check
- mv src/.libs/*.gc* src