add Qt version dependent test black list

qgis · Aug 17, 2021 · 5cd745c · 5cd745c
1 parent 7a42711
commit 5cd745c
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 1 deletion.
diff --git a/.ci/test_blocklist.txt → .ci/test_blocklist_qt5.txt b/.ci/test_blocklist.txt → .ci/test_blocklist_qt5.txt
diff --git a/.ci/test_blocklist_qt6.txt b/.ci/test_blocklist_qt6.txt
@@ -0,0 +1,71 @@
+# Qt6 blacklist
+test_core_authconfig
+test_core_callout
+test_core_compositionconverter
+test_core_datadefinedsizelegend
+test_core_dxfexport
+test_core_expression
+test_core_field
+test_core_fontmarker
+test_core_geometry
+test_core_labelingengine
+test_core_layertree
+test_core_layout
+test_core_layouthtml
+test_core_layoutlabel
+test_core_layoutmanualtable
+test_core_layoutmap
+test_core_layoutmapgrid
+test_core_layoutmapoverview
+test_core_layoutmultiframe
+test_core_layoutpicture
+test_core_layoutscalebar
+test_core_layouttable
+test_core_legendrenderer
+test_core_mapdevicepixelratio
+test_core_maprendererjob
+test_core_maprotation
+test_core_meshlayer
+test_core_meshlayerrenderer
+test_core_networkaccessmanager
+test_core_ogcutils
+test_core_pallabeling
+test_core_point
+test_core_pointpatternfillsymbol
+test_core_project
+test_core_projectstorage
+test_core_rasterlayer
+test_core_rastermarker
+test_core_style
+test_core_tiledownloadmanager
+test_core_vectortilelayer
+test_core_coordinatereferencesystem
+test_analysis_processingalgs
+test_analysis_zonalstatistics
+test_analysis_meshcontours
+test_geometry_checker_geometrychecks
+
+# black list
+PyQgsLocalServer
+PyQgsPalLabelingServer
+qgis_composerutils
+PyQgsAppStartup
+
+# code layout tests are run on separate build
+qgis_spelling
+qgis_sipify
+qgis_sip_include
+qgis_sip_uptodate
+
+# Need a local postgres installation
+PyQgsAuthManagerOgrPostgresTest
+PyQgsDbManagerPostgis
+
+# Needs an OpenCL device, the library is not enough
+test_core_openclutils
+
+# Relies on a broken/unreliable 3rd party service
+test_core_layerdefinition
+
+# MSSQL requires the MSSQL docker
+PyQgsProviderConnectionMssql
diff --git a/.docker/docker-qgis-test.sh b/.docker/docker-qgis-test.sh
@@ -175,7 +175,7 @@ fi
 ###########
 # Run tests
 ###########
-EXCLUDE_TESTS=$(cat /root/QGIS/.ci/test_blocklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)
+EXCLUDE_TESTS=$(cat /root/QGIS/.ci/test_blocklist_qt${QT_VERSION}.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)
 if ! [[ ${RUN_FLAKY_TESTS} == true ]]; then
   echo "Flaky tests are skipped!"
   EXCLUDE_TESTS=${EXCLUDE_TESTS}"|"$(cat /root/QGIS/.ci/test_flaky.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)

diff --git a/.docker/docker-variables.env b/.docker/docker-variables.env
@@ -8,6 +8,7 @@ CTEST_BUILD_DIR=/root/QGIS
 # CTEST vars defined in workflow
 CTEST_BUILD_NAME
 RUN_FLAKY_TESTS
+QT_VERSION
 
 # Other vars
 QGIS_NO_OVERRIDE_IMPORT=1

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -93,11 +93,13 @@ jobs:
           CTEST_BUILD_NAME=$( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo "PR${GITHUB_PR_NUMBER}" || echo ${GITHUB_REF##*/} )"_${GITHUB_SHA}"
           echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV
           echo "CTEST_BUILD_NAME=${CTEST_BUILD_NAME}" >> $GITHUB_ENV
+          echo "QT_VERSION=${{ matrix.qt-version }}" >> $GITHUB_ENV
 
       - name: Print vars
         run: |
           echo DOCKER_TAG: ${DOCKER_TAG}
           echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}
+          echo QT_VERSION: ${QT_VERSION}
 
       - name: Build Docker Container with Build Environment
         id: docker-build