Add another format, and blacklist some more

2 files changed, 22 insertions, 1 deletions

diff --git a/tests/arthur/baselineserver/src/baselineserver.cpp b/tests/arthur/baselineserver/src/baselineserver.cpp
index e7a994f..5328f59 100644
--- a/tests/arthur/baselineserver/src/baselineserver.cpp
+++ b/tests/arthur/baselineserver/src/baselineserver.cpp
@@ -131,6 +131,11 @@ void BaselineHandler::provideBaselineChecksums(const QByteArray &itemListBlock)
     qDebug() << runId << logtime() << "Received request for checksums for" << itemList.count() << "items";
 
     for (ImageItemList::iterator i = itemList.begin(); i != itemList.end(); ++i) {
+        if (i->scriptName.startsWith(QLatin1String("porter_duff"))) {
+            // Example of blacklisting on server.
+            i->status = ImageItem::IgnoreItem;
+            continue;
+        }
         i->imageChecksum = 0;
         QString prefix = pathForItem(*i, true);
         QFile file(prefix + QLatin1String("metadata"));
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp
index c968473..0f57c1e 100644
--- a/tests/auto/lancelot/tst_lancelot.cpp
+++ b/tests/auto/lancelot/tst_lancelot.cpp
@@ -83,6 +83,8 @@ private slots:
     void testRasterARGB32PM();
     void testRasterRGB32_data();
     void testRasterRGB32();
+    void testRasterRGB16_data();
+    void testRasterRGB16();
 
     void testOpenGL_data();
     void testOpenGL();
@@ -151,9 +153,23 @@ void tst_Lancelot::testRasterRGB32()
 }
 
 
-void tst_Lancelot::testOpenGL_data()
+void tst_Lancelot::testRasterRGB16_data()
 {
     QStringList localBlacklist = QStringList() << QLatin1String("sizes.qps");
+    if (!setupTestSuite(ImageItem::Raster, QImage::Format_RGB16, localBlacklist))
+        QSKIP("Communication with baseline image server failed.", SkipAll);
+}
+
+
+void tst_Lancelot::testRasterRGB16()
+{
+    runTestSuite();
+}
+
+
+void tst_Lancelot::testOpenGL_data()
+{
+    QStringList localBlacklist = QStringList() << QLatin1String("sizes.qps") << QLatin1String("rasterops.qps");
     if (!setupTestSuite(ImageItem::OpenGL, QImage::Format_RGB32, localBlacklist))
         QSKIP("Communication with baseline image server failed.", SkipAll);
 }