aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdebian/rules6
-rw-r--r--tests/Makefile.am2
2 files changed, 4 insertions, 4 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
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