From 1a75da8d514c90cf1af250ba3eaa764df4838775 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Wed, 3 May 2017 12:14:24 +0300 Subject: 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 --- tests/auto/qml/qml.pro | 3 +++ tests/auto/websockets/websockets.pro | 3 +++ 2 files changed, 6 insertions(+) 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 -- cgit v1.2.1