summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestblacklist.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-09-24 08:37:35 +0200
committerLars Knoll <lars.knoll@digia.com>2014-09-24 08:58:42 +0200
commit44a381087eba209c318104f5b027728b9f8db86e (patch)
tree58619305e360e6baa8046ab372c9e6de5bca7d35 /src/testlib/qtestblacklist.cpp
parent2699d40b577cbfd9c07ac6bc9b4d828f4b798f6c (diff)
Add * as a valid token to our blacklisting
This helps to blacklist a test function on all platforms, something that isn't easily possible currently. Adding [testfunction] * to the BLACKLIST file will now blacklist the function on all platforms. Change-Id: I9e1a1daf94caa05408a6b3cd7ea7a3acdc962a43 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
-rw-r--r--src/testlib/qtestblacklist.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index 7921b350b5..69f8ae4ca5 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -70,6 +70,7 @@ QT_BEGIN_NAMESPACE
// this table can be extended with new keywords as required
const char *matchedConditions[] =
{
+ "*",
#ifdef Q_OS_LINUX
"linux",
#endif