From fa0b50e747e8be0b3ac17367efdf11b8c8f3fcd5 Mon Sep 17 00:00:00 2001
From: Nicholas Guriev <nicholas@guriev.su>
Date: Sat, 24 Apr 2021 23:10:31 +0300
Subject: debian/rules: Run tests while building DEB package.

---
 debian/control | 14 +++++++-------
 debian/rules   |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'debian')

diff --git a/debian/control b/debian/control
index df4d39f..0ede198 100644
--- a/debian/control
+++ b/debian/control
@@ -19,15 +19,15 @@ Build-Depends: cmake,
                liblomiri-url-dispatcher-dev | hello,
                libproperties-cpp-dev,
 # for the test harness:
-               libgtest-dev,
-               libdbustest1-dev,
-               dbus-test-runner,
-               python3-dbusmock,
+               libgtest-dev <!nocheck>,
+               libdbustest1-dev <!nocheck>,
+               dbus-test-runner <!nocheck>,
+               python3-dbusmock <!nocheck>,
 # for 12h/24h locale unit tests:
-               locales,
+               locales <!nocheck>,
 # for running live EDS tests:
-               evolution-data-server,
-               gvfs-daemons,
+               evolution-data-server <!nocheck>,
+               gvfs-daemons <!nocheck>,
                systemd [linux-any],
 # for phone alarm/calendar notification sound tests:
                ubuntu-touch-sounds | hello,
diff --git a/debian/rules b/debian/rules
index 37eb8b7..0a1b6f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,10 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 %:
 	dh $@ --with systemd
 
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_configure:
 	dh_auto_configure -- -Denable_tests=OFF
+endif
 
 override_dh_install:
 	dh_install --fail-missing
-- 
cgit v1.2.3


From fa557f1f5d124d583d4241b72f440a09b6714fc4 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 27 Apr 2021 22:46:24 +0200
Subject: debian/rules: Adjust previous commit to renamed ENABLE_TESTS build
 option.

---
 debian/rules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'debian')

diff --git a/debian/rules b/debian/rules
index 0a1b6f7..96adb33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,10 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 %:
 	dh $@ --with systemd
 
-ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_configure:
-	dh_auto_configure -- -Denable_tests=OFF
+	dh_auto_configure -- -DENABLE_TESTS=ON
 endif
 
 override_dh_install:
 	dh_install --fail-missing
-
-
-- 
cgit v1.2.3