AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the remaining blacklist setting into TestMethods::invokeTest()

Browse Source 
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>
This commit is contained in:
Kalle Viironen 2023-08-28 10:46:46 +03:00
parent 66345ce785
commit 028dcbdb37
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/testlib/qtestblacklist.cpp
View File

@ -302,7 +302,6 @@ bool checkBlackLists(const char *slot, const char *data, const char *global)
}
}
QTestResult::setBlacklistCurrentTest(ignore);
return ignore;
}

6
src/testlib/qtestcase.cpp
View File

@ -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));