diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-18 17:19:19 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-23 12:22:56 +0100 |
| commit | c013104b0417626077f52f4d2216381382b2d9bd (patch) | |
| tree | 2fe128626f2d79fa41385e061948a3dbbc9f0c9a /tests/auto/auto.pro | |
| parent | 7f34bee8493bce5b690f864a1c5da4493ce8e409 (diff) | |
Temporarily disable the QtDBus tests if the session bus isn't available
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>
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index a9aecc9448..01952aac3c 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -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 +} |