diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2016-02-02 11:41:22 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2016-02-23 12:19:31 +0000 |
| commit | 950bb7185c320ca9fe776bf0dc2a9589bf193a0d (patch) | |
| tree | 2aef8154a792e4cd0a5e1dd5e039655853b78aa3 /tests | |
| parent | fc6d5ed18da29138494803baa11c0edc22ace7f4 (diff) | |
Autotests: if cross-compiling, ignore dbus status on compilation host
The auto.pro file would bail out or skip based on the availability of
the session bus at qmake time. That does not make sense for cross
compilation: the session bus may be available on the target even if it
is not on the compilation host.
Change-Id: I459a518f3411acb39e8dcdad9d32ded1f9b57029
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index e905a416a6..ad7998a198 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -29,9 +29,10 @@ cross_compile: SUBDIRS -= tools cmake installed_cma !qtHaveModule(printsupport): SUBDIRS -= printsupport !qtHaveModule(concurrent): SUBDIRS -= concurrent !qtHaveModule(network): SUBDIRS -= network +!qtHaveModule(dbus): SUBDIRS -= dbus # Disable the QtDBus tests if we can't connect to the session bus -qtHaveModule(dbus) { +!cross_compile:qtHaveModule(dbus) { !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") { contains(QT_CONFIG, dbus-linked): \ error("QtDBus is enabled but session bus is not available. Please check the installation.") @@ -39,6 +40,4 @@ qtHaveModule(dbus) { warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.") SUBDIRS -= dbus } -} else { - SUBDIRS -= dbus } |