From 1a542f25447686ab7a5eea759a33f20ce9eeaacc Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@theqtcompany.com>
Date: Tue, 17 Mar 2015 13:06:09 +0100
Subject: testlib: Detect distribution name/release for blacklisting tests

Add possibility to blacklist distributions using the syntax:
"<productType>" and "<productType>-<productVersion>".

productType and productVersion are the values returned by
QSysInfo::productType() and QSysInfo::productVersion() (in lower case).

Change-Id: Iefd948127dd2133c2f2ab7aeb5b0c9749c3df6c5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
---
 src/testlib/qtestblacklist.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index 1cf2ee09e3..cd115bdcae 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -36,6 +36,7 @@
 #include <QtTest/qtestcase.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qfile.h>
+#include <QtCore/QSysInfo>
 
 #include <set>
 
@@ -121,6 +122,14 @@ static bool checkCondition(const QByteArray &condition)
         ++m;
     }
 
+    QByteArray distributionName = QSysInfo::productType().toLower().toUtf8();
+    QByteArray distributionRelease = QSysInfo::productVersion().toLower().toUtf8();
+    if (!distributionName.isEmpty()) {
+        if (matches.find(distributionName) == matches.end())
+            matches.insert(distributionName);
+        matches.insert(distributionName + "-" + distributionRelease);
+    }
+
     for (int i = 0; i < conds.size(); ++i) {
         QByteArray c = conds.at(i);
         bool result = c.startsWith('!');
-- 
cgit v1.2.3