summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-04-27 09:59:10 +0300
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-04-27 08:08:36 +0000
commit25e51976c3324630525346ccb785fafe48ea5ed9 (patch)
tree0ea04e93de9289936413666a4ed6f1007cbb50b6
parent17011993257c0e5624ecf9d1836b28ffa68482cf (diff)
Disable/blacklist failing tests for boot2qt
Currently boot2qt is tested with QEMU and the test crashes. Disabling for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ic11740de638b4783add72ee0bb19a5fbba086a68 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--tests/auto/auto.pro3
-rw-r--r--tests/auto/qchart/BLACKLIST3
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 81557a7f..321ca26c 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -37,6 +37,9 @@ SUBDIRS += \
qtHaveModule(quick) {
SUBDIRS += qml \
qml-qtquicktest
+
+ # QTBUG-20268
+ boot2qt: SUBDIRS -= qml-qtquicktest
}
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
diff --git a/tests/auto/qchart/BLACKLIST b/tests/auto/qchart/BLACKLIST
new file mode 100644
index 00000000..a73cce28
--- /dev/null
+++ b/tests/auto/qchart/BLACKLIST
@@ -0,0 +1,3 @@
+[zoomOut]
+# QTBUG-20268
+b2qt