qmltest: Move the remaining blacklist setting into caller functions

QTestPrivate::checkBlackLists function now returns true if the
test case is blacklisted, so we can move the remaining blacklist
setting from checkBlackLists into callig functions.

Change-Id: I27e26e56aecbf6b05289a57d9fcff86897a173da
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 98d6f7912a..9c7dc89f66 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -223,7 +223,8 @@ void QuickTestResult::setFunctionName(const QString &name)
             QString fullName = d->testCaseName + QLatin1String("::") + name;
             QTestResult::setCurrentTestFunction
                 (d->intern(fullName).constData());
-            QTestPrivate::checkBlackLists(fullName.toUtf8().constData(), nullptr);
+            if (QTestPrivate::checkBlackLists(fullName.toUtf8().constData(), nullptr))
+                QTestResult::setBlacklistCurrentTest(true);
         }
     } else {
         QTestResult::setCurrentTestFunction(nullptr);
@@ -252,7 +253,10 @@ void QuickTestResult::setDataTag(const QString &tag)
     if (!tag.isEmpty()) {
         QTestData *data = &(QTest::newRow(tag.toUtf8().constData()));
         QTestResult::setCurrentTestData(data);
-        QTestPrivate::checkBlackLists((testCaseName() + QLatin1String("::") + functionName()).toUtf8().constData(), tag.toUtf8().constData());
+        if (QTestPrivate::checkBlackLists((testCaseName() + QLatin1String("::")
+            + functionName()).toUtf8().constData(), tag.toUtf8().constData())) {
+            QTestResult::setBlacklistCurrentTest(true);
+        }
         emit dataTagChanged();
     } else {
         QTestResult::setCurrentTestData(nullptr);