summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@theqtcompany.com>2015-09-17 10:49:50 +0200
committerRainer Keller <rainer.keller@theqtcompany.com>2015-10-15 14:00:34 +0000
commit7db9c610f1acb89b359e43400ba70d99a7b00e91 (patch)
tree0a3d87391c13c40ceb53f4fdf4287e1139554044 /src/testlib
parent53569c1383928b279a6e9077303cfeca9d86d765 (diff)
Add processor types to blacklist keywords
This allows to disable tests that do not work on ARM machines. Change-Id: I80b54da2978479e037b73ca3af87567e8d9d1b60 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qtestblacklist.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index c2643a2304..fe69e097e7 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -121,6 +121,13 @@ static QSet<QByteArray> keywords()
#endif
#endif
+#ifdef Q_PROCESSOR_X86
+ << "x86"
+#endif
+#ifdef Q_PROCESSOR_ARM
+ << "arm"
+#endif
+
#ifdef Q_AUTOTEST_EXPORT
<< "developer-build"
#endif