Skip to content

Commit dc0855f

Browse files
lbartolettilbartoletti
authoredJul 31, 2017
Merge branch 'master' into regularShape_gui
·
ltr-3_40final-3_0_0
2 parents 6036fa6 + 0db8a58 commit dc0855f

File tree

849 files changed

+28765
-7049
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

849 files changed

+28765
-7049
lines changed
 

‎.ci/travis/code_layout/script.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
set -e
1616

1717
pushd build
18-
xvfb-run ctest -V --output-on-failure
18+
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
19+
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
1920
popd

‎.ci/travis/linux/blacklist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ qgis_composerutils
77
ProcessingGrass7AlgorithmsImageryTest
88
ProcessingGrass7AlgorithmsRasterTest
99
PyQgsDBManagerGpkg
10+
PyQgsAppStartup
1011

1112
# temporary during processing refactoring
1213
ProcessingParametersTest

0 commit comments

Comments
 (0)