summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestblacklist.cpp
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@theqtcompany.com>2015-03-17 13:06:09 +0100
committerCaroline Chao <caroline.chao@theqtcompany.com>2015-03-30 08:41:49 +0000
commit1a542f25447686ab7a5eea759a33f20ce9eeaacc (patch)
tree1942ee6ac3e9533d8a58a7e89ac14cebe11a4d76 /src/testlib/qtestblacklist.cpp
parentd1ee1c52d1c5024aa3f64f79e21927aeb27627b5 (diff)
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>
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
-rw-r--r--src/testlib/qtestblacklist.cpp9
1 files changed, 9 insertions, 0 deletions
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('!');