diff --git a/.travis.yml b/.travis.yml index 3cb0c6bb0..5f48dc3f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ compiler: env: matrix: - #- DEBUG=True ENABLE_LOG=True DEFAULT_LOG_SEVERITY=debug XMLPARSER="libxml2" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS="" - - DEBUG=False ENABLE_LOG=False DEFAULT_LOG_SEVERITY=none XMLPARSER="ptree" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS="" + - DEBUG=True ENABLE_LOG=True DEFAULT_LOG_SEVERITY=debug XMLPARSER="libxml2" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS="" + - DEBUG=False ENABLE_LOG=False DEFAULT_LOG_SEVERITY=none XMLPARSER="ptree" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS="" # travis + ubuntugis with gdal and postggis leads to many potential dead-end conflicts # the below is thanks to https://github.com/CartoDB/Windshaft/blob/d82fe08b32fc7907bbe907ab290f8a082215ae26/.travis.yml#L1 @@ -45,7 +45,7 @@ before_script: script: - ./configure CXX="${CXX}" CC="${CC}" CUSTOM_CXXFLAGS="${CUSTOM_CXXFLAGS}" CUSTOM_LDFLAGS="${CUSTOM_LDFLAGS}" XML_PARSER="${XML_PARSER}" ENABLE_LOG="${ENABLE_LOG}" DEBUG="${DEBUG}" DEMO="${DEMO}" BENCHMARK="${BENCHMARK}" CPP_TESTS=True CAIRO=True FAST=True || cat config.log - - if [[ "${DEBUG}" == true ]]; then JOBS=1 make; else JOBS=2 make; fi; + - if [[ "${DEBUG}" == true ]]; then JOBS=2 make; else JOBS=6 make; fi; - git clone https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data - make test - source localize.sh && make grind