From 5f3529be32df3cce81e77c3dbb76cfda7feb320c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 10 Sep 2015 13:27:50 +0200 Subject: Silence warnings about missing dbus-send command not found Without piping the output to /dev/null, we'd get the following: sh: dbus-send: command not found And if dbus support is only limited to runtime support, we don't treat it as a fatal error and only notice the user. Change-Id: Ia7750a074b8d563bf9694fa8fa628b4017e8bb68 Reviewed-by: Thiago Macieira --- tests/auto/auto.pro | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 6f06ba591f..9cab3c9e42 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -32,8 +32,11 @@ cross_compile: SUBDIRS -= tools # Disable the QtDBus tests if we can't connect to the session bus qtHaveModule(dbus) { - !system("dbus-send --session --type=signal / local.AutotestCheck.Hello"): { - warning("QtDBus is enabled but session bus is not available. Please check the installation.") + !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.") + else: \ + warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.") SUBDIRS -= dbus } } else { -- cgit v1.2.3