summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-03 12:22:08 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-03 15:12:33 +0000
commit3598ffcc26dbae14d88c32fabfc8be465eed8f61 (patch)
tree1053451c754544759845931aa5d5e7c792694dbe /tests
parentd225f73c09d3fa8a4699f03d67c5d8a7838357d5 (diff)
Disable tests with qemu-arm & developer-build configurations in the CI
After commit b88acae7a8e773c307e44f84da037d01d19e60f7 in qt5, the developer-build enabled qemu-arm tests were disabled and after that changes were introduced in qtbase that would make tests fail (such as qtextmarkdownwriter or tst_QSocks5SocketEngine). These tests would still be run when another repository enables qemu-arm developer builds, such as qtdeclarative. This patch removes that test coverage. We can't really change the behavior of the CI to not run tests in dependent repos when a repo adds test configurations (such as qtdeclarative.yaml) as that in turn would remove the test coverage that qt5.yaml adds over default.yaml. Also amends d225f73c09d3fa8a4699f03d67c5d8a7838357d5 Change-Id: I05bdeac7fffbbfcc2be7904cb06067897958f30d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro4
-rw-r--r--tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST1
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 9eb741edac..c9d1da8649 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,5 +1,9 @@
TEMPLATE = subdirs
+# Tests with developer-build started failing on qemu-armv7/armv8 after commit
+# b88acae7a8e773c307e44f84da037d01d19e60f7 in qt5.
+boot2qt:qtConfig(private_tests): return()
+
SUBDIRS += \
corelib \
dbus \
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST b/tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST
index a35e0f303e..0ce46130ce 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST
+++ b/tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST
@@ -1,3 +1,2 @@
[rewriteDocument]
winrt
-ci b2qt