1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring QTestPrivate::checkBlackLists() back

Browse Source 
This change partially reverts 641eb4a965.

Task-number: QTBUG-71141
Change-Id: I423332cc89db4b8137e71fdd57798039d429d0d2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Liang Qi 2018-10-15 15:16:19 +02:00
parent d88c65a532
commit af6d4d0687
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testlib/qtestblacklist.cpp
View File

@ -259,7 +259,7 @@ void parseBlackList()
} }
} }
void checkBlackList(const char *slot, const char *data) void checkBlackLists(const char *slot, const char *data)
{ {
bool ignore = ignoreAll; bool ignore = ignoreAll;

2
src/testlib/qtestblacklist_p.h
View File

@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
namespace QTestPrivate { namespace QTestPrivate {
// Export functions so they can also be used by QQuickTest // Export functions so they can also be used by QQuickTest
Q_TESTLIB_EXPORT void parseBlackList(); Q_TESTLIB_EXPORT void parseBlackList();
Q_TESTLIB_EXPORT void checkBlackList(const char *slot, const char *data); Q_TESTLIB_EXPORT void checkBlackLists(const char *slot, const char *data);
} }
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/testlib/qtestcase.cpp
View File

@ -1103,7 +1103,7 @@ bool TestMethods::invokeTest(int index, const char *data, WatchDog *watchDog) co
if (!data || !qstrcmp(data, table.testData(curDataIndex)->dataTag())) { if (!data || !qstrcmp(data, table.testData(curDataIndex)->dataTag())) {
foundFunction = true; foundFunction = true;
QTestPrivate::checkBlackList(name.constData(), dataCount ? table.testData(curDataIndex)->dataTag() : 0); QTestPrivate::checkBlackLists(name.constData(), dataCount ? table.testData(curDataIndex)->dataTag() : 0);
QTestDataSetter s(curDataIndex >= dataCount ? static_cast<QTestData *>(0) QTestDataSetter s(curDataIndex >= dataCount ? static_cast<QTestData *>(0)
: table.testData(curDataIndex)); : table.testData(curDataIndex));