[PATCH 3/3] test: move GNUPGHOME to TEST_TMPDIR

[Tomi Ollila]

On Tue, Feb 28 2017, David Bremner <david at tethera.net> wrote:

> 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.
> ---

LGTM.

Tomi

>  test/test-lib-common.sh | 1 -
>  test/test-lib.sh        | 2 ++
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
> index 03ef1d2d..a96cfbeb 100644
> --- a/test/test-lib-common.sh
> +++ b/test/test-lib-common.sh
> @@ -158,7 +158,6 @@ export HOME="${TMP_DIRECTORY}/home"
>  mkdir -p "${HOME}"
>  
>  MAIL_DIR="${TMP_DIRECTORY}/mail"
> -export GNUPGHOME="${TMP_DIRECTORY}/gnupg"
>  export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config"
>  
>  mkdir -p "${test}"
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 86e792a8..518d9c7f 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -270,6 +270,8 @@ die () {
>  GIT_EXIT_OK=
>  # Note: TEST_TMPDIR *NOT* exported!
>  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_signal' HUP INT TERM
>  
> -- 
> 2.11.0
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch