diff options
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
-rw-r--r-- | src/testlib/qtestblacklist.cpp | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index ae2913da9a..886f1f75b9 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -221,22 +221,6 @@ static bool checkCondition(const QByteArray &condition) static bool ignoreAll = false; static std::set<QByteArray> *ignoredTests = 0; -static std::set<QByteArray> *gpuFeatures = 0; - -Q_TESTLIB_EXPORT std::set<QByteArray> *(*qgpu_features_ptr)(const QString &) = 0; - -static bool isGPUTestBlacklisted(const char *slot, const char *data = 0) -{ - const QByteArray disableKey = QByteArrayLiteral("disable_") + QByteArray(slot); - if (gpuFeatures->find(disableKey) != gpuFeatures->end()) { - QByteArray msg = QByteArrayLiteral("Skipped due to GPU blacklist: ") + disableKey; - if (data) - msg += ':' + QByteArray(data); - QTest::qSkip(msg.constData(), __FILE__, __LINE__); - return true; - } - return false; -} namespace QTestPrivate { @@ -276,17 +260,6 @@ void parseBlackList() } } -void parseGpuBlackList() -{ - if (!qgpu_features_ptr) - return; - QString filename = QTest::qFindTestData(QStringLiteral("GPU_BLACKLIST")); - if (filename.isEmpty()) - return; - if (!gpuFeatures) - gpuFeatures = qgpu_features_ptr(filename); -} - void checkBlackLists(const char *slot, const char *data) { bool ignore = ignoreAll; @@ -302,21 +275,8 @@ void checkBlackLists(const char *slot, const char *data) } QTestResult::setBlacklistCurrentTest(ignore); - - // Tests blacklisted in GPU_BLACKLIST are to be skipped. Just ignoring the result is - // not sufficient since these are expected to crash or behave in undefined ways. - if (!ignore && gpuFeatures) { - QByteArray s_gpu = slot; - ignore = isGPUTestBlacklisted(s_gpu, data); - if (!ignore && data) { - s_gpu += ':'; - s_gpu += data; - isGPUTestBlacklisted(s_gpu); - } - } -} - } +} // QTestPrivate QT_END_NAMESPACE |