From 0340120d5f7940c9aebfd0f60328805227f8824d Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Thu, 27 Apr 2017 15:36:16 +0300 Subject: Disable/blacklist failing tests for boot2qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Ic6494b8a17d4bd277f04472bea9d83cb20bc3805 Reviewed-by: Tomi Korpipää --- tests/auto/auto.pro | 3 +++ tests/auto/cpptest/cpptest.pro | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 70ffea39..ec2dc3ba 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,3 +5,6 @@ TEMPLATE = subdirs qtHaveModule(quick): SUBDIRS += qmltest installed_cmake.depends = cmake + +# QTBUG-60268 +boot2qt: SUBDIRS -= qmltest diff --git a/tests/auto/cpptest/cpptest.pro b/tests/auto/cpptest/cpptest.pro index abd8f38e..ac91d813 100644 --- a/tests/auto/cpptest/cpptest.pro +++ b/tests/auto/cpptest/cpptest.pro @@ -24,3 +24,14 @@ SUBDIRS = q3dbars \ q3dcustom \ q3dcustom-label \ q3dcustom-volume + +# QTBUG-60268 +boot2qt { + SUBDIRS -= q3dbars \ + q3dcustom-label \ + q3dsurface-modelproxy \ + q3dbars-modelproxy \ + q3dscene \ + q3dscatter \ + q3dsurface +} -- cgit v1.2.3