From 028dcbdb37c68ae2142da7ad01bf58a4b694a87c Mon Sep 17 00:00:00 2001
From: Kalle Viironen <kalle.viironen@qt.io>
Date: Mon, 28 Aug 2023 10:46:46 +0300
Subject: [PATCH] Move the remaining blacklist setting into
 TestMethods::invokeTest()

Move the remaining QTestResult::setBlacklistCurrentTest()
call from checkBlackLists() into TestMethods::invokeTest()

Change-Id: I6f0bb26ef612e707ad013d1e42e47b06f40482a0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
---
 src/testlib/qtestblacklist.cpp | 1 -
 src/testlib/qtestcase.cpp      | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index d3f01883e24..ccd8ba73c4e 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -302,7 +302,6 @@ bool checkBlackLists(const char *slot, const char *data, const char *global)
         }
     }
 
-    QTestResult::setBlacklistCurrentTest(ignore);
     return ignore;
 }
 
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 7540c9a2475..d3153123633 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1443,8 +1443,10 @@ bool TestMethods::invokeTest(int index, QLatin1StringView tag, WatchDog *watchDo
             if (dataTagMatches(tag, QLatin1StringView(dataTag(curDataIndex)),
                                QLatin1StringView(globalDataTag(curGlobalDataIndex)))) {
                 foundFunction = true;
-                QTestPrivate::checkBlackLists(name.constData(), dataTag(curDataIndex),
-                                              globalDataTag(curGlobalDataIndex));
+                if (QTestPrivate::checkBlackLists(name.constData(), dataTag(curDataIndex),
+                                                  globalDataTag(curGlobalDataIndex))) {
+                    QTestResult::setBlacklistCurrentTest(true);
+                 }
 
                 QTestDataSetter s(curDataIndex >= dataCount ? nullptr : table.testData(curDataIndex));