3598ffcc26
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 d225f73c09
Change-Id: I05bdeac7fffbbfcc2be7904cb06067897958f30d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
55 lines
1.7 KiB
Prolog
55 lines
1.7 KiB
Prolog
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 \
|
|
gui \
|
|
network \
|
|
opengl \
|
|
sql \
|
|
testlib \
|
|
tools \
|
|
xml \
|
|
concurrent \
|
|
other \
|
|
widgets \
|
|
printsupport \
|
|
cmake \
|
|
installed_cmake
|
|
|
|
installed_cmake.depends = cmake
|
|
|
|
uikit: SUBDIRS = corelib gui
|
|
|
|
cross_compile: SUBDIRS -= tools cmake installed_cmake
|
|
else:!qtConfig(process): SUBDIRS -= tools
|
|
winrt|!qtHaveModule(opengl): SUBDIRS -= opengl
|
|
!qtHaveModule(gui): SUBDIRS -= gui
|
|
!qtHaveModule(widgets): SUBDIRS -= widgets
|
|
!qtHaveModule(printsupport): SUBDIRS -= printsupport
|
|
!qtHaveModule(concurrent): SUBDIRS -= concurrent
|
|
winrt|!qtHaveModule(network): SUBDIRS -= network
|
|
!qtHaveModule(dbus): SUBDIRS -= dbus
|
|
!qtHaveModule(xml): SUBDIRS -= xml
|
|
!qtHaveModule(sql): SUBDIRS -= sql
|
|
|
|
# Disable the QtDBus tests if we can't connect to the session bus
|
|
!cross_compile:qtHaveModule(dbus) {
|
|
!system("dbus-send --session --type=signal / local.AutotestCheck.Hello >$$QMAKE_SYSTEM_NULL_DEVICE 2>&1") {
|
|
qtConfig(dbus-linked): \
|
|
error("QtDBus is enabled but session bus is not available. Please check the installation.")
|
|
else: \
|
|
warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.")
|
|
SUBDIRS -= dbus
|
|
}
|
|
}
|
|
|
|
# QTBUG-63915
|
|
boot2qt: {
|
|
SUBDIRS -= dbus
|
|
}
|