summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-04-27 15:36:16 +0300
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-04-28 11:16:53 +0000
commit0340120d5f7940c9aebfd0f60328805227f8824d (patch)
tree29131f10c9317ab70df35f591296afbc594efc8d
parentd58ec7629ba79058f8b7a27be3c6fb2947f5a017 (diff)
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: Ic6494b8a17d4bd277f04472bea9d83cb20bc3805 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--tests/auto/auto.pro3
-rw-r--r--tests/auto/cpptest/cpptest.pro11
2 files changed, 14 insertions, 0 deletions
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
+}