sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

travis: add SCons timings, fix comment in Makefile

Browse source
This commit is contained in:
Mickey Rose 2016-01-31 15:36:00 +01:00
parent 4ef8efd554
commit f9248914af
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -99,7 +99,7 @@ script:
else else
./configure BENCHMARK=${BENCH}; ./configure BENCHMARK=${BENCH};
fi fi
- make - SCONSFLAGS='--debug=time' make
- make test || TEST_RESULT=$? - make test || TEST_RESULT=$?
- if [[ ${COVERAGE} == true ]]; then - if [[ ${COVERAGE} == true ]]; then
./mason_packages/.link/bin/cpp-coveralls --build-root . --gcov-options '\-lp' --exclude mason_packages --exclude .sconf_temp --exclude benchmark --exclude deps --exclude scons --exclude test --exclude demo --exclude docs --exclude fonts --exclude utils > /dev/null; ./mason_packages/.link/bin/cpp-coveralls --build-root . --gcov-options '\-lp' --exclude mason_packages --exclude .sconf_temp --exclude benchmark --exclude deps --exclude scons --exclude test --exclude demo --exclude docs --exclude fonts --exclude utils > /dev/null;

2
Makefile
View file

@ -41,7 +41,7 @@ python:
python bindings/python/test/visual.py -q python bindings/python/test/visual.py -q
src/json/libmapnik-json.a: src/json/libmapnik-json.a:
# we first build memory intensive files with -j1 # we first build memory intensive files with -j$(HEAVY_JOBS)
$(PYTHON) scons/scons.py -j$(HEAVY_JOBS) \ $(PYTHON) scons/scons.py -j$(HEAVY_JOBS) \
--config=cache --implicit-cache --max-drift=1 \ --config=cache --implicit-cache --max-drift=1 \
src/renderer_common/render_group_symbolizer.os \ src/renderer_common/render_group_symbolizer.os \