diff --git a/.travis.yml b/.travis.yml index 6c6e4af..7e49bb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,23 +5,26 @@ sudo: false matrix: include: - os: linux - addons: - apt: - packages: [ 'protobuf-compiler', 'libprotobuf-dev' ] - - os: linux + compiler: gcc env: COVERAGE=gcov-4.9 CXX=g++-4.9 CC=gcc-4.9 addons: apt: sources: ['ubuntu-toolchain-r-test'] packages: [ 'g++-4.9', 'protobuf-compiler', 'libprotobuf-dev' ] + - os: linux + compiler: clang + addons: + apt: + packages: [ 'protobuf-compiler', 'libprotobuf-dev' ] - os: osx + compiler: clang install: - if [[ $(uname -s) == 'Darwin' ]]; then brew install protobuf; fi; - if [ -n "${COVERAGE}" ]; then - export CXXFLAGS="--coverage"; - export CFLAGS="--coverage"; + export CXXFLAGS="--coverage -g"; + export CFLAGS="--coverage -g"; export LDFLAGS="--coverage"; fi; - make @@ -30,6 +33,7 @@ script: - echo '{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[0,0]}}' > test.json - ./tippecanoe -o test.mbtiles test.json - if [ -n "${COVERAGE}" ]; then + ls ${COVERAGE} -lp *.o; pip install --user cpp-coveralls; ~/.local/bin/coveralls --no-gcov -i ./;