Merge pull request #138 from mapbox/travis-improvements

Add code coverage
This commit is contained in:
Eric Fischer 2016-01-29 10:40:36 -08:00
commit 29355c1afd
3 changed files with 26 additions and 1 deletions

View File

@ -5,13 +5,37 @@ sudo: false
matrix:
include:
- os: linux
compiler: gcc
env: COVERAGE=gcov-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 CXX=g++-4.9;
export CC=gcc-4.9;
export CXXFLAGS="--coverage -g";
export CFLAGS="--coverage -g";
export LDFLAGS="--coverage";
fi;
- make
script:
- make test
- if [ -n "${COVERAGE}" ]; then
rm vector_tile.pb.o;
${COVERAGE} -lp *.o;
pip install --user cpp-coveralls;
~/.local/bin/coveralls --no-gcov -i ./ --exclude clipper --exclude vector_tile.pb.cc --exclude vector_tile.pb.h;
fi

View File

@ -52,7 +52,7 @@ libjsonpull.a: jsonpull.o
ranlib $@
%.o: %.c $(H)
cc $(PG) $(INCLUDES) -O3 -g -Wall $(CFLAGS) -c $<
$(CC) $(PG) $(INCLUDES) -O3 -g -Wall $(CFLAGS) -c $<
%.o: %.cc $(H)
$(CXX) $(PG) $(INCLUDES) -O3 -g -Wall $(CXXFLAGS) -c $<

View File

@ -5,6 +5,7 @@ Builds [vector tilesets](https://www.mapbox.com/developers/vector-tiles/) from l
features. This is a tool for [making maps from huge datasets](MADE_WITH.md).
[![Build Status](https://travis-ci.org/mapbox/tippecanoe.svg)](https://travis-ci.org/mapbox/tippecanoe)
[![Coverage Status](https://coveralls.io/repos/mapbox/tippecanoe/badge.svg?branch=master&service=github)](https://coveralls.io/github/mapbox/tippecanoe?branch=master)
Intent
------