using a single list to exclude tests on travis

3nids · 3nids · commit 6ce8d9480b97 · 2017-02-21T16:35:06.000+01:00
diff --git a/ci/travis/linux/blacklist.txt b/ci/travis/linux/blacklist.txt
@@ -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
diff --git a/ci/travis/linux/script.sh b/ci/travis/linux/script.sh
@@ -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
diff --git a/ci/travis/osx/blacklist.txt b/ci/travis/osx/blacklist.txt
@@ -0,0 +1,9 @@
+qgis_openstreetmaptest
+qgis_wcsprovidertest
+PyQgsServer
+ProcessingGdalAlgorithmsTest
+PyQgsOfflineEditingWFS
+ProcessingGrass7AlgorithmsImageryTest
+ProcessingGrass7AlgorithmsRasterTest
+qgis_composerhtmltest
+PyQgsOfflineEditingWFS
diff --git a/ci/travis/osx/script.sh b/ci/travis/osx/script.sh
@@ -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
