Skip to content
Permalink
Browse files

using a single list to exclude tests on travis

  • Loading branch information
3nids committed Feb 21, 2017
1 parent 896e3c7 commit 6ce8d9480b979e786f5f47ce0e784b056f829b10
Showing with 19 additions and 3 deletions.
  1. +8 −0 ci/travis/linux/blacklist.txt
  2. +1 −1 ci/travis/linux/script.sh
  3. +9 −0 ci/travis/osx/blacklist.txt
  4. +1 −2 ci/travis/osx/script.sh
@@ -1,3 +1,4 @@
# black list
PyQgsJSONUtils
PyQgsLocalServer
PyQgsPalLabelingServer
@@ -6,3 +7,10 @@ qgis_composerutils
ProcessingGrass7AlgorithmsImageryTest
ProcessingGrass7AlgorithmsRasterTest
PyQgsDBManagerGpkg

# flacky
qgis_filedownloader
qgis_openstreetmaptest
qgis_wcsprovidertest
PyQgsWFSProviderGUI
qgis_ziplayertest
@@ -32,5 +32,5 @@ if [ "$CACHE_WARMING" = true ] ; then
xvfb-run ctest -V -R NOTESTS -S ./qgis-test-travis.ctest --output-on-failure
false
else
xvfb-run ctest -V -E "qgis_filedownloader|qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
fi
@@ -0,0 +1,9 @@
qgis_openstreetmaptest
qgis_wcsprovidertest
PyQgsServer
ProcessingGdalAlgorithmsTest
PyQgsOfflineEditingWFS
ProcessingGrass7AlgorithmsImageryTest
ProcessingGrass7AlgorithmsRasterTest
qgis_composerhtmltest
PyQgsOfflineEditingWFS
@@ -17,5 +17,4 @@ echo $PATH

export PATH=/usr/bin:${PATH}

ctest -V -E 'qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsServer|ProcessingGdalAlgorithmsTest|PyQgsOfflineEditingWFS|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTest|qgis_composerhtmltest|PyQgsOfflineEditingWFS' -S ./qgis-test-travis.ctest --output-on-failure

ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure

0 comments on commit 6ce8d94

Please sign in to comment.
You can’t perform that action at this time.