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

Autotests: if cross-compiling, ignore dbus status on compilation host

Browse Source 
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>
This commit is contained in:
Eirik Aavitsland 2016-02-02 11:41:22 +01:00 committed by aavit
parent fc6d5ed18d
commit 950bb7185c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/auto.pro
View File

@ -29,9 +29,10 @@ cross_compile: SUBDIRS -= tools cmake installed_cma
!qtHaveModule(printsupport): SUBDIRS -= printsupport !qtHaveModule(printsupport): SUBDIRS -= printsupport
!qtHaveModule(concurrent): SUBDIRS -= concurrent !qtHaveModule(concurrent): SUBDIRS -= concurrent
!qtHaveModule(network): SUBDIRS -= network !qtHaveModule(network): SUBDIRS -= network
!qtHaveModule(dbus): SUBDIRS -= dbus
# Disable the QtDBus tests if we can't connect to the session bus # 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") { !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") {
contains(QT_CONFIG, dbus-linked): \ contains(QT_CONFIG, dbus-linked): \
error("QtDBus is enabled but session bus is not available. Please check the installation.") 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.") warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.")
SUBDIRS -= dbus SUBDIRS -= dbus
} }
} else {
SUBDIRS -= dbus
} }