diff options
author | Kalle Viironen <kalle.viironen@qt.io> | 2023-08-28 10:46:46 +0300 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@qt.io> | 2023-11-20 08:58:17 +0300 |
commit | 028dcbdb37c68ae2142da7ad01bf58a4b694a87c (patch) | |
tree | ac9fbe9fdb6d70c52e2d9835fe59895a5324283e | |
parent | 66345ce785ce73e3b35b51278cafe3bf114884eb (diff) |
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>
-rw-r--r-- | src/testlib/qtestblacklist.cpp | 1 | ||||
-rw-r--r-- | 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 d3f01883e2..ccd8ba73c4 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 7540c9a247..d315312363 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)); |