diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2017-04-12 09:41:09 +0300 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2017-04-12 09:41:09 +0300 |
commit | 43c053b753e278a465cf7b5a155d332e0eb240d4 (patch) | |
tree | b9167098a6a7b69e657cd8032d8fcfc977f8cb5e | |
parent | 52cbcb2d41b6eeabc4d9bcd4da44816cbb1da08d (diff) | |
download | rpm-43c053b753e278a465cf7b5a155d332e0eb240d4.tar.gz |
Avoid stale gpg-agents in test root
gpg2 wants to leave gpg-agent running in the background which is fine,
until we pull the rug from underneath it by nuking the test root it
was launched in, causing us to hang on --addsign tests. Shut down
any agents running in the test root before nuking it for an update.
-rw-r--r-- | tests/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d96d70101..6adc7096a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -110,6 +110,7 @@ EXTRA_DIST += atlocal.in # Hack: Abusing testing$(bindir)/rpmbuild as stamp file # The chmod is needed when copying from read-only sources (eg in distcheck) testing$(bindir)/rpmbuild: ../rpmbuild + HOME=$(abs_srcdir)/testing gpg-connect-agent --no-autostart killagent bye ||: rm -rf testing mkdir -p testing/$(bindir) ln -s ./$(bindir) testing/bin |