AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporarily disable the QtDBus tests if the session bus isn't available

Browse Source 
This is a temporary measure while the Qt CI system is updated to have
the correct D-Bus configuration. Once it is fixed, this commit should be
reverted, so that we don't run into the situation in which the tests
aren't getting run on some configurations and we never know about it.

Change-Id: I7192d4d95a60dcb63acfa6cc90bfdc58592b0664
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2014-12-18 17:19:19 -08:00
parent 7f34bee849
commit c013104b04
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/auto.pro
View File

@ -24,9 +24,18 @@ ios: SUBDIRS = corelib gui
wince*: SUBDIRS -= printsupport
cross_compile: SUBDIRS -= tools
!qtHaveModule(opengl): SUBDIRS -= opengl
!unix|embedded|!qtHaveModule(dbus): SUBDIRS -= dbus
!qtHaveModule(gui): SUBDIRS -= gui cmake
!qtHaveModule(widgets): SUBDIRS -= widgets
!qtHaveModule(printsupport): SUBDIRS -= printsupport
!qtHaveModule(concurrent): SUBDIRS -= concurrent
!qtHaveModule(network): SUBDIRS -= network
# Disable the QtDBus tests if we can't connect to the session bus
qtHaveModule(dbus) {
!system("dbus-send --type=signal / local.AutotestCheck.Hello"): {
warning("QtDBus is enabled but session bus is not available. Please check the installation.")
SUBDIRS -= dbus
}
} else {
SUBDIRS -= dbus
}