diff options
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index dca51983de..eb7abdad46 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -166,11 +166,13 @@ static std::set<QByteArray> *gpuFeatures = 0; Q_TESTLIB_EXPORT std::set<QByteArray> *(*qgpu_features_ptr)(const QString &) = 0; -static bool isGPUTestBlacklisted(const char *slot) +static bool isGPUTestBlacklisted(const char *slot, const char *data = 0) { const QByteArray disableKey = QByteArrayLiteral("disable_") + QByteArray(slot); if (gpuFeatures->find(disableKey) != gpuFeatures->end()) { - const QByteArray msg = QByteArrayLiteral("Skipped due to GPU blacklist: ") + disableKey; + QByteArray msg = QByteArrayLiteral("Skipped due to GPU blacklist: ") + disableKey; + if (data) + msg += QByteArrayLiteral(":") + QByteArray(data); QTest::qSkip(msg.constData(), __FILE__, __LINE__); return true; } @@ -242,7 +244,7 @@ void checkBlackLists(const char *slot, const char *data) // not sufficient since these are expected to crash or behave in undefined ways. if (!ignore && gpuFeatures) { QByteArray s_gpu = slot; - ignore = isGPUTestBlacklisted(s_gpu); + ignore = isGPUTestBlacklisted(s_gpu, data); if (!ignore && data) { s_gpu += ':'; s_gpu += data; |