Merge branch 'master' into regularShape_gui

qgis · Jul 31, 2017 · dc0855f · dc0855f
2 parents 6036fa6 + 0db8a58
commit dc0855f
Show file tree

Hide file tree

Showing 849 changed files with 28,765 additions and 7,049 deletions.
diff --git a/.ci/travis/code_layout/script.sh b/.ci/travis/code_layout/script.sh
@@ -15,5 +15,6 @@
 set -e
 
 pushd build
-xvfb-run ctest -V --output-on-failure
+export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
+python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "sip_uptodate|spelling" --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
 popd
diff --git a/.ci/travis/linux/blacklist.txt b/.ci/travis/linux/blacklist.txt
@@ -7,6 +7,7 @@ qgis_composerutils
 ProcessingGrass7AlgorithmsImageryTest
 ProcessingGrass7AlgorithmsRasterTest
 PyQgsDBManagerGpkg
+PyQgsAppStartup
 
 # temporary during processing refactoring
 ProcessingParametersTest

diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ matrix:
       env:
         - LLVM_VERSION=3.8
         - TRAVIS_CONFIG=linux
+      dist: precise
       sudo: false
       cache:
         apt: true
@@ -49,6 +50,7 @@ matrix:
         apt:
           sources:
             - sourceline: 'ppa:jonathonf/backports'  # silversearcher-ag backport
+            - sourceline: 'ppa:sergey-dryabzhinsky/packages' # doxygen
           packages:
             - doxygen
             - graphviz