Skip to content

Commit fba87f7

Browse files
volayavolaya
committedOct 10, 2016
Merge branch 'master' of https://github.com/qgis/QGIS into processing_parameters_refactoring
Conflicts: python/plugins/processing/gui/ExtentSelectionPanel.py
2 parents 9b75746 + 3b1dfa7 commit fba87f7

File tree

201 files changed

+2551
-850
lines changed

Some content is hidden

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

201 files changed

+2551
-850
lines changed
 

‎ci/travis/linux/install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ cmake \
4242
-DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \
4343
-DWITH_STAGED_PLUGINS=ON \
4444
-DWITH_GRASS=ON \
45+
-DWITH_GRASS7=ON \
46+
-DGRASS_PREFIX7=/home/travis/osgeo4travis/grass-7.0.4 \
4547
-DSUPPRESS_QT_WARNINGS=ON \
4648
-DENABLE_MODELTEST=ON \
4749
-DENABLE_PGTEST=ON \

‎ci/travis/linux/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ export CCACHE_TEMPDIR=/tmp
2121

2222
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2323

24-
xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|qgis_ogcutilstest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
24+
xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
2525
# xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest" -S ./qgis-test-travis.ctest --output-on-failure

0 commit comments

Comments
 (0)