tests: less gpg-agent killings when using netpgp
authorEdouard Tisserant <edouard@pep-project.org>
Fri, 07 Jul 2017 16:17:10 +0200
changeset 1911db8b70e61f55
parent 1910 8a1cf9cf1b87
child 1912 b2f4e198adef
tests: less gpg-agent killings when using netpgp
test/Makefile
     1.1 --- a/test/Makefile	Fri Jul 07 10:05:47 2017 -0400
     1.2 +++ b/test/Makefile	Fri Jul 07 16:17:10 2017 +0200
     1.3 @@ -54,14 +54,20 @@
     1.4  	HOME=$(TEST_HOME) gpgconf --kill gpg-agent
     1.5  	HOME=$(TEST_HOME_SKEL) gpgconf --kill gpg-agent
     1.6  endef
     1.7 +ifeq ("$(OPENPGP)","NETPGP")
     1.8 +    killgpg_if_using_it =
     1.9 +else
    1.10 +    killgpg_if_using_it = $(killgpg)
    1.11 +endif
    1.12  
    1.13  test_home_skel:
    1.14  	$(killgpg)
    1.15  	mkdir -p test_home_skel
    1.16  	-cat 0x*.asc *_sec.asc | gpg2 --import --homedir $(TEST_GNUPGHOME_SKEL)
    1.17 +	$(killgpg)
    1.18  
    1.19  test_home_: test_home_skel
    1.20 -	$(killgpg)
    1.21 +	$(killgpg_if_using_it)
    1.22  	rm -rf test_home
    1.23  	cp -a test_home_skel test_home
    1.24