commit:     52cd8398bcfe6a5da6859b6d8973f4762e6d1aa7
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 09:18:24 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 11:28:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52cd8398

app-editors/emacs: Fix mml-sec-tests.el

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/emacs-29.1-r6.ebuild   | 13 +++++--------
 app-editors/emacs/emacs-29.1.90.ebuild   | 13 +++++--------
 app-editors/emacs/emacs-29.1.9999.ebuild | 13 +++++--------
 app-editors/emacs/emacs-30.0.9999.ebuild | 13 +++++--------
 4 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/app-editors/emacs/emacs-29.1-r6.ebuild 
b/app-editors/emacs/emacs-29.1-r6.ebuild
index 9cfd899f30d4..c15027e0bbea 100644
--- a/app-editors/emacs/emacs-29.1-r6.ebuild
+++ b/app-editors/emacs/emacs-29.1-r6.ebuild
@@ -213,6 +213,11 @@ src_prepare() {
        sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
                test/lisp/emacs-lisp/bytecomp-tests.el || die
 
+       # Tests use this dir as GNUPGHOME. Move to shorter path, in order
+       # not to exceed the 108 char limit for GnuPG's sockets on Linux.
+       mv test/lisp/gnus/mml-sec-resources "${T}"/gnupg || die
+       ln -s "${T}"/gnupg test/lisp/gnus/mml-sec-resources || die
+
        AT_M4DIR=m4 eautoreconf
 }
 
@@ -409,14 +414,6 @@ src_test() {
        # subtests which caused failure. Elements should begin with a %.
        # e.g. %lisp/gnus/mml-sec-tests.el.
        local exclude_tests=(
-               # Reason: not yet known
-               # mml-secure-en-decrypt-{1,2,3,4}
-               # mml-secure-find-usable-keys-{1,2}
-               # mml-secure-key-checks
-               # mml-secure-select-preferred-keys-4
-               # mml-secure-sign-verify-1
-               %lisp/gnus/mml-sec-tests.el
-
                # Reason: permission denied on /nonexistent
                # (vc-*-bzr only fails if breezy is installed, as they
                # try to access cache dirs under /nonexistent)

diff --git a/app-editors/emacs/emacs-29.1.90.ebuild 
b/app-editors/emacs/emacs-29.1.90.ebuild
index 9aff860d84f5..8a58f10bc90e 100644
--- a/app-editors/emacs/emacs-29.1.90.ebuild
+++ b/app-editors/emacs/emacs-29.1.90.ebuild
@@ -210,6 +210,11 @@ src_prepare() {
        sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
                test/lisp/emacs-lisp/bytecomp-tests.el || die
 
+       # Tests use this dir as GNUPGHOME. Move to shorter path, in order
+       # not to exceed the 108 char limit for GnuPG's sockets on Linux.
+       mv test/lisp/gnus/mml-sec-resources "${T}"/gnupg || die
+       ln -s "${T}"/gnupg test/lisp/gnus/mml-sec-resources || die
+
        AT_M4DIR=m4 eautoreconf
 }
 
@@ -406,14 +411,6 @@ src_test() {
        # subtests which caused failure. Elements should begin with a %.
        # e.g. %lisp/gnus/mml-sec-tests.el.
        local exclude_tests=(
-               # Reason: not yet known
-               # mml-secure-en-decrypt-{1,2,3,4}
-               # mml-secure-find-usable-keys-{1,2}
-               # mml-secure-key-checks
-               # mml-secure-select-preferred-keys-4
-               # mml-secure-sign-verify-1
-               %lisp/gnus/mml-sec-tests.el
-
                # Reason: permission denied on /nonexistent
                # (vc-*-bzr only fails if breezy is installed, as they
                # try to access cache dirs under /nonexistent)

diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild 
b/app-editors/emacs/emacs-29.1.9999.ebuild
index 9aff860d84f5..8a58f10bc90e 100644
--- a/app-editors/emacs/emacs-29.1.9999.ebuild
+++ b/app-editors/emacs/emacs-29.1.9999.ebuild
@@ -210,6 +210,11 @@ src_prepare() {
        sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
                test/lisp/emacs-lisp/bytecomp-tests.el || die
 
+       # Tests use this dir as GNUPGHOME. Move to shorter path, in order
+       # not to exceed the 108 char limit for GnuPG's sockets on Linux.
+       mv test/lisp/gnus/mml-sec-resources "${T}"/gnupg || die
+       ln -s "${T}"/gnupg test/lisp/gnus/mml-sec-resources || die
+
        AT_M4DIR=m4 eautoreconf
 }
 
@@ -406,14 +411,6 @@ src_test() {
        # subtests which caused failure. Elements should begin with a %.
        # e.g. %lisp/gnus/mml-sec-tests.el.
        local exclude_tests=(
-               # Reason: not yet known
-               # mml-secure-en-decrypt-{1,2,3,4}
-               # mml-secure-find-usable-keys-{1,2}
-               # mml-secure-key-checks
-               # mml-secure-select-preferred-keys-4
-               # mml-secure-sign-verify-1
-               %lisp/gnus/mml-sec-tests.el
-
                # Reason: permission denied on /nonexistent
                # (vc-*-bzr only fails if breezy is installed, as they
                # try to access cache dirs under /nonexistent)

diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild 
b/app-editors/emacs/emacs-30.0.9999.ebuild
index 9ed35f39b910..02c7ef6e61da 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -211,6 +211,11 @@ src_prepare() {
        sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
                test/lisp/emacs-lisp/bytecomp-tests.el || die
 
+       # Tests use this dir as GNUPGHOME. Move to shorter path, in order
+       # not to exceed the 108 char limit for GnuPG's sockets on Linux.
+       mv test/lisp/gnus/mml-sec-resources "${T}"/gnupg || die
+       ln -s "${T}"/gnupg test/lisp/gnus/mml-sec-resources || die
+
        AT_M4DIR=m4 eautoreconf
 }
 
@@ -408,14 +413,6 @@ src_test() {
        # subtests which caused failure. Elements should begin with a %.
        # e.g. %lisp/gnus/mml-sec-tests.el.
        local exclude_tests=(
-               # Reason: not yet known
-               # mml-secure-en-decrypt-{1,2,3,4}
-               # mml-secure-find-usable-keys-{1,2}
-               # mml-secure-key-checks
-               # mml-secure-select-preferred-keys-4
-               # mml-secure-sign-verify-1
-               %lisp/gnus/mml-sec-tests.el
-
                # Reason: permission denied on /nonexistent
                # (vc-*-bzr only fails if breezy is installed, as they
                # try to access cache dirs under /nonexistent)

Reply via email to