mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-22 02:48:08 +01:00
test: move GNUPGHOME to TEST_TMPDIR
We already use this directory for dtach sockets, so it makes sense to put gnupg sockets there as well. There doesn't seem to be a clean way to put a fully functional socket in a different location than GNUPGHOME.
This commit is contained in:
parent
a4ddc63b23
commit
1044775fc0
2 changed files with 2 additions and 1 deletions
|
@ -158,7 +158,6 @@ export HOME="${TMP_DIRECTORY}/home"
|
||||||
mkdir -p "${HOME}"
|
mkdir -p "${HOME}"
|
||||||
|
|
||||||
MAIL_DIR="${TMP_DIRECTORY}/mail"
|
MAIL_DIR="${TMP_DIRECTORY}/mail"
|
||||||
export GNUPGHOME="${TMP_DIRECTORY}/gnupg"
|
|
||||||
export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config"
|
export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config"
|
||||||
|
|
||||||
mkdir -p "${test}"
|
mkdir -p "${test}"
|
||||||
|
|
|
@ -270,6 +270,8 @@ die () {
|
||||||
GIT_EXIT_OK=
|
GIT_EXIT_OK=
|
||||||
# Note: TEST_TMPDIR *NOT* exported!
|
# Note: TEST_TMPDIR *NOT* exported!
|
||||||
TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
|
TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
|
||||||
|
# Put GNUPGHOME in TMPDIR to avoid problems with long paths.
|
||||||
|
export GNUPGHOME="${TEST_TMPDIR}/gnupg"
|
||||||
trap 'trap_exit' EXIT
|
trap 'trap_exit' EXIT
|
||||||
trap 'trap_signal' HUP INT TERM
|
trap 'trap_signal' HUP INT TERM
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue