From 04a517eca8b9e964bb2d096d6edf6f7d8a9e8b35 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 30 Apr 2021 17:20:26 +0200 Subject: tests/Makefile.am: Add --keep-env option to dbus-test-runner calls. Allows propagating e.g. a build HOME into the DBus test environment. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a2080bd..7d2adc6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -168,7 +168,7 @@ TESTS += libappindicator-tests DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) libappindicator-tests-gtester -DBUS_RUNNER=dbus-test-runner -m 300 --dbus-config /usr/share/dbus-test-runner/session.conf +DBUS_RUNNER=dbus-test-runner --keep-env -m 300 --dbus-config /usr/share/dbus-test-runner/session.conf test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am @echo "#!/bin/bash" > test-libappindicator-dbus -- cgit v1.2.3 From 6173997abf4dadb72b3ac749aac57d4251b28ca7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 30 Apr 2021 17:27:41 +0200 Subject: debian/rules: Switch to official Debian's dotest-% target. This stops ignoring unit tests during DEB package buids (and also fixes them). --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 8ad670f..d4c149e 100755 --- a/debian/rules +++ b/debian/rules @@ -64,11 +64,11 @@ override_dh_install: override_dh_auto_test: $(FLAVORS:%=dotest-%) dotest-%: - mkdir -p $(CURDIR)/debian/tmphome/.cache - export HOME=$(CURDIR)/debian/tmphome && export XDG_CACHE_HOME=$(CURDIR)/debian/tmphome/.cache && dh_auto_test --builddirectory=build/$* -- || true + mkdir -p $(CURDIR)/debian/tmphome-$* + export HOME=$(CURDIR)/debian/tmphome-$* && dh_auto_test --no-parallel --builddirectory=build/$* # View test's log file for better debugging of problems when built in clean chroots. if [ -e build/$*/tests/test-suite.log ]; then cat build/$*/tests/test-suite.log; fi - rm -Rf $(CURDIR)/debian/tmphome + rm -Rf $(CURDIR)/debian/tmphome-$* override_dh_auto_clean: dh_auto_clean -- cgit v1.2.3