summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-23 16:33:31 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-26 17:42:06 +0200
commite32427a536c8311d677be2d7b893b5b065a2b367 (patch)
treebb157a27a59653ccd3a898bdc553d4257370cf90
parent5d715e09aed7071157f4dd604c7f150b9fd1750d (diff)
Don't error out when configuring Qt on a headless system
Configuring and building Qt should not require a running dbus session bus. However, when building the html_docs target on a headless system, qmake bails out with error if dbus is linked in, while only showing a warning if it's not. This is unnecessary. We can warn in both cases, build the tests with dbus linked in. Running the tests will fail if there is no session bus, ie. tst_QDBusConnection_Delayed::delayedMessages fails with QVERIFY(session.isConnected); (adapted from d26fe3c5d6d73b0663a33d2f25ed053cc1f70d5e) Change-Id: Ia6b6e226398e87880449b003d28dfd76553bee2c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--tests/auto/auto.pro9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 9eb741edac..da7d821c6f 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -36,11 +36,12 @@ winrt|!qtHaveModule(network): SUBDIRS -= network
# 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: \
+ qtConfig(dbus-linked): {
+ warning("QtDBus is enabled but session bus is not available. QtDBus tests will fail.")
+ } else {
warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.")
- SUBDIRS -= dbus
+ SUBDIRS -= dbus
+ }
}
}