summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-05-03 12:14:24 +0300
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-05-09 08:15:47 +0000
commit1a75da8d514c90cf1af250ba3eaa764df4838775 (patch)
tree8af7256893e91358f90958fbc49cd8acca3ce99c
parentf0598777769718ed65ef0479ea3aaf5c94eca94c (diff)
downloadqtwebsockets-1a75da8d514c90cf1af250ba3eaa764df4838775.tar.gz
Disable/blacklist failing tests for boot2qt
Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ib93153c857c1645c189db1bd69951cc29acfdccf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--tests/auto/qml/qml.pro3
-rw-r--r--tests/auto/websockets/websockets.pro3
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 8951c55..2d2fde4 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -1,3 +1,6 @@
TEMPLATE = subdirs
!uikit: SUBDIRS += qmlwebsockets qmlwebsockets_compat
+
+# QTBUG-60268
+boot2qt: SUBDIRS -= qmlwebsockets_compat
diff --git a/tests/auto/websockets/websockets.pro b/tests/auto/websockets/websockets.pro
index b000229..4b7ee4e 100644
--- a/tests/auto/websockets/websockets.pro
+++ b/tests/auto/websockets/websockets.pro
@@ -14,3 +14,6 @@ qtConfig(private_tests): SUBDIRS += \
SUBDIRS += \
qwebsocket \
qwebsocketserver
+
+# QTBUG-60268
+boot2qt: SUBDIRS -= qwebsocketserver