From cee2ed154221f2b52d91d5097bb7bb535c7fa6b2 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Sat, 16 Nov 2019 00:52:25 +0100
Subject: [PATCH] make "make test" target work properly

---
 nymea.pro                | 5 +++--
 tests/auto/autotests.pri | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nymea.pro b/nymea.pro
index 4d8ffca4..acd5e33d 100644
--- a/nymea.pro
+++ b/nymea.pro
@@ -58,8 +58,9 @@ INSTALLS += translations
 
 QMAKE_EXTRA_TARGETS += lupdate lrelease
 
-test.depends = licensecheck lrelease
-test.commands = LD_LIBRARY_PATH=$$top_builddir/libnymea-core:$$top_builddir/libnymea:$$top_builddir/tests/testlib make check
+test.depends = licensecheck
+test.depends += lrelease
+test.commands = LD_LIBRARY_PATH=$$top_builddir/libnymea-core:$$top_builddir/libnymea:$$top_builddir/tests/testlib make check TESTRUNNER=\"dbus-test-runner --bus-type=system --task\"
 QMAKE_EXTRA_TARGETS += test
 
 # Show doc files in project tree
diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri
index e2f15432..64af8559 100644
--- a/tests/auto/autotests.pri
+++ b/tests/auto/autotests.pri
@@ -13,3 +13,6 @@ LIBS += -L$$top_builddir/libnymea/ -lnymea \
 
 target.path = /usr/tests
 INSTALLS += target
+
+test.commands = LD_LIBRARY_PATH=../../../libnymea:../../../libnymea-core/:../../testlib/ make check TESTRUNNER=\"dbus-test-runner --bus-type=system --task\"
+QMAKE_EXTRA_TARGETS += test