From cd1dcbf8ca81d0f927a21f542cd365049fd8f3ee Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 17 Oct 2024 13:31:10 +1000
Subject: [PATCH] When excluding tests, only exclude exact matches

Otherwise eg an entry in the blocklist for PyQgsAnnotation will
prevent the PyQgsAnnotationRectTextItem test from running
---
 .docker/docker-qgis-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/docker-qgis-test.sh b/.docker/docker-qgis-test.sh
index b21d35c154b..c7e91d014ca 100755
--- a/.docker/docker-qgis-test.sh
+++ b/.docker/docker-qgis-test.sh
@@ -265,10 +265,10 @@ fi
 ###########
 # Run tests
 ###########
-EXCLUDE_TESTS=$(cat ${SRCDIR}/.ci/test_blocklist_qt${QT_VERSION}.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)
+EXCLUDE_TESTS="^$(cat ${SRCDIR}/.ci/test_blocklist_qt${QT_VERSION}.txt | sed -r '/^(#.*?)?$/d' | paste -sd '~' | sed -r 's/~/\$|^/g' -)\$"
 if ! [[ ${RUN_FLAKY_TESTS} == true ]]; then
   echo "Flaky tests are skipped!"
-  EXCLUDE_TESTS=${EXCLUDE_TESTS}"|"$(cat ${SRCDIR}/.ci/test_flaky.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)
+  EXCLUDE_TESTS=${EXCLUDE_TESTS}"|^"$(cat ${SRCDIR}/.ci/test_flaky.txt | sed -r '/^(#.*?)?$/d' | paste -sd '~' | sed -r 's/~/\$|^/g' -)"$"
 else
   echo "Flaky tests are run!"
 fi