summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestblacklist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
-rw-r--r--src/testlib/qtestblacklist.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index 587930ca73..0ebc800fe1 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -82,7 +82,9 @@ QT_BEGIN_NAMESPACE
msvc-2010
Keys are lower-case. Distribution name and version are supported if
- QSysInfo's productType() and productVersion() return them.
+ QSysInfo's productType() and productVersion() return them. Keys can be
+ added via the space-separated QTEST_ENVIRONMENT environment variable.
+
The other known keys are listed below:
*/
@@ -184,6 +186,11 @@ static QSet<QByteArray> activeConditions()
}
}
+ if (qEnvironmentVariableIsSet("QTEST_ENVIRONMENT")) {
+ for (const QByteArray &k : qgetenv("QTEST_ENVIRONMENT").split(' '))
+ result.insert(k);
+ }
+
return result;
}