debian/rules: clean up stale gpg-agent processes after testing

This commit is contained in:
Simon McVittie 2016-03-31 09:21:59 +01:00
parent bbac523213
commit 00272963ef
2 changed files with 3 additions and 0 deletions

1
debian/changelog vendored
View File

@ -9,6 +9,7 @@ ostree (2016.4-1) UNRELEASED; urgency=medium
* Fix ITP bug number in changelog (was #813308, should have been #697477) * Fix ITP bug number in changelog (was #813308, should have been #697477)
* debian/control: build-depend on attr, for the tests (only required if * debian/control: build-depend on attr, for the tests (only required if
/var/tmp supports extended attributes) /var/tmp supports extended attributes)
* debian/rules: clean up stale gpg-agent processes after testing
* debian/rules: warn if there are leftover daemon processes after testing * debian/rules: warn if there are leftover daemon processes after testing
* debian/patches: add patches to get the build-time tests passing under * debian/patches: add patches to get the build-time tests passing under
sbuild sbuild

2
debian/rules vendored
View File

@ -26,6 +26,8 @@ override_dh_auto_configure:
override_dh_auto_test: override_dh_auto_test:
dh_auto_test dh_auto_test
# One test creates multiple GPG homedirs, each with its own agent
pkill --full "gpg-agent --homedir /var/tmp/tap-test\\.[^/]+/repo/tmp/ostree-gpg-[^/]+ " || :
if pgrep lt-ostree || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; then \ if pgrep lt-ostree || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; then \
echo "WARNING: daemon processes were leaked"; \ echo "WARNING: daemon processes were leaked"; \
pgrep gpg-agent | xargs --no-run-if-empty ps ww; \ pgrep gpg-agent | xargs --no-run-if-empty ps ww; \