diff options
| author | David Bremner <david@tethera.net> | 2017-02-28 21:21:07 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-02-28 21:21:07 -0400 |
| commit | 508b5c20fa38b17fa527af075857061f4ed81e2a (patch) | |
| tree | ad0ae7898db74c3e6c1a9362e671da1aff5b2840 /test | |
| parent | 5c0f1bd36790e680f7d3b6082e3606bd3b84a588 (diff) | |
| parent | 770d00a8955b2ad8be9daf2923e31221c4847043 (diff) | |
Merge branch 'release'
Second gnugpg test suite fix
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-lib-common.sh | 1 | ||||
| -rw-r--r-- | test/test-lib.sh | 16 |
2 files changed, 2 insertions, 15 deletions
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 d8e15943..02634ac1 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -230,19 +230,10 @@ test_fixed=0 test_broken=0 test_success=0 - -_shutdown_gpg_agent () { - if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then - gpgconf --kill gpg-agent - gpgconf --remove-socketdir - fi -} - _exit_common () { code=$? trap - EXIT set +ex - _shutdown_gpg_agent rm -rf "$TEST_TMPDIR" } @@ -280,6 +271,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 @@ -1286,11 +1279,6 @@ test_init_ () { . ./test-lib-common.sh || exit 1 -# we need the setting of GNUPGHOME in test-lib-common.sh -if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then - gpgconf --create-socketdir -fi - emacs_generate_script |