summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-10-20 16:09:29 +0300
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-10-21 09:31:01 +0000
commit9c58dd15885d813aeb5d83d2869c0f3a3ee5fcfe (patch)
tree972bc89da58103822971f646a7890fbf53a6e081 /tests
parent8aadfbc6572b0cbb8d435ceb7cd288c9d5cb909c (diff)
Blacklist and skip failing tests for Boot2Qt / 64 bit arm
Task-number: QTBUG-60263 Change-Id: I05978915b5bb7ae31069e8e9ae1dc273e483ddb0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro5
-rw-r--r--tests/auto/corelib/global/qlogging/BLACKLIST3
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 0f8129cb74..3caa6a3b65 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -43,3 +43,8 @@ else:!qtConfig(process): SUBDIRS -= tools
SUBDIRS -= dbus
}
}
+
+# QTBUG-63915
+boot2qt: {
+ contains(QT_ARCH, arm64): SUBDIRS -= dbus
+}
diff --git a/tests/auto/corelib/global/qlogging/BLACKLIST b/tests/auto/corelib/global/qlogging/BLACKLIST
new file mode 100644
index 0000000000..1dcee92361
--- /dev/null
+++ b/tests/auto/corelib/global/qlogging/BLACKLIST
@@ -0,0 +1,3 @@
+[qMessagePattern:backtrace depth,separator]
+# QTBUG-63915
+b2qt 64bit