From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jan 2018 13:56:42 +0000 (+0000)
Subject: test suite: gnupg setup: give each individual test its own AGENT.log
X-Git-Tag: archive/debian/4.2~26
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=146a5fd470b72ea0a034c1da808d78e08b203351;p=dgit.git

test suite: gnupg setup: give each individual test its own AGENT.log

This was always the intent.  However, the structure here arranged to
put the actual value of GNUPGHOME into the import script.

Instead, move the GNUGPHOME setting into the setup fragment, which is
evaluated by the importer.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index 43a5c96d..9b4d0990 100755
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -6,18 +6,17 @@ mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
 
-export GNUPGHOME=$tmp/gnupg
+setup='
+	export GNUPGHOME=$tmp/gnupg
 
-cat >$tmp/gnupg/gpg-agent.conf <<END
-log-file $tmp/gnupg/AGENT.log
+	cat >$tmp/gnupg/gpg-agent.conf <<END
+	log-file $tmp/gnupg/AGENT.log
 END
-#debug-all
+	#debug-all
 
-setup='
 	: ${DGIT_TEST_REAL_GPG_AGENT:=$(type -p gpg-agent)}
 	export DGIT_TEST_REAL_GPG_AGENT=$(type -p gpg-agent)
 	export DGIT_STUNT_AGENT=$troot/tstunt/gpg-agent
-	export GNUPGHOME
 	t-tstunt gpg
 '
 
@@ -25,6 +24,6 @@ eval "$setup"
 
 gpg --list-secret
 
-t-setup-done 'GNUPGHOME' 'gnupg' "$setup"
+t-setup-done '' 'gnupg' "$setup"
 
 t-ok