commit: 427c8f5fd8ca8a983673cdc20e867e0199ac478b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Aug 24 23:21:41 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 26 07:46:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427c8f5f
app-editors/emacs: enable tests for >= 28.1.91-r1 Still skipping some tests but this is a start. They were originally disabled b/c of some issues where Mercurial was not installed, but I can't hit that now. For 29.x, one of the failing tests is already fixed (files-tests-file-name-non-special-file-in-directory-p). Bug: https://bugs.gentoo.org/663026 Signed-off-by: Sam James <sam <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/27008 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/emacs/emacs-28.1.91-r1.ebuild | 54 ++++++++++++++++++++++++++++++- app-editors/emacs/emacs-28.1.9999.ebuild | 54 ++++++++++++++++++++++++++++++- app-editors/emacs/emacs-29.0.9999.ebuild | 48 ++++++++++++++++++++++++++- 3 files changed, 153 insertions(+), 3 deletions(-) diff --git a/app-editors/emacs/emacs-28.1.91-r1.ebuild b/app-editors/emacs/emacs-28.1.91-r1.ebuild index f40d3160db81..de0ccc6dce2f 100644 --- a/app-editors/emacs/emacs-28.1.91-r1.ebuild +++ b/app-editors/emacs/emacs-28.1.91-r1.ebuild @@ -44,7 +44,6 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" -RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -177,6 +176,9 @@ src_prepare() { src_configure() { local myconf + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." @@ -317,6 +319,56 @@ src_compile() { emake } +src_test() { + # List .el test files with a comment above listing the exact + # 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: race condition + # Looks like it should be fixed in 29.x at least: + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706 + # files-tests-file-name-non-special-file-in-directory-p + %lisp/files-tests.el + + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: fails if bubblewrap (bwrap) is installed + # "bwrap: setting up uid map: Permission denied" + # + # bytecomp-tests--dest-mountpoint + %lisp/emacs-lisp/bytecomp-tests.el + ) + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + src_install() { emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild index 9dde01902de3..8b050ba1f509 100644 --- a/app-editors/emacs/emacs-28.1.9999.ebuild +++ b/app-editors/emacs/emacs-28.1.9999.ebuild @@ -41,7 +41,6 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" -RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -179,6 +178,9 @@ src_prepare() { src_configure() { local myconf + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." @@ -319,6 +321,56 @@ src_compile() { emake } +src_test() { + # List .el test files with a comment above listing the exact + # 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: race condition + # Looks like it should be fixed in 29.x at least: + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706 + # files-tests-file-name-non-special-file-in-directory-p + %lisp/files-tests.el + + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: fails if bubblewrap (bwrap) is installed + # "bwrap: setting up uid map: Permission denied" + # + # bytecomp-tests--dest-mountpoint + %lisp/emacs-lisp/bytecomp-tests.el + ) + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + src_install() { emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild index c533ab2a5a6e..c88004a9780d 100644 --- a/app-editors/emacs/emacs-29.0.9999.ebuild +++ b/app-editors/emacs/emacs-29.0.9999.ebuild @@ -41,7 +41,6 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft +xpm xwidgets zlib" -RESTRICT="test" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -201,6 +200,9 @@ src_prepare() { src_configure() { local myconf + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." @@ -369,6 +371,50 @@ src_compile() { emake } +src_test() { + # List .el test files with a comment above listing the exact + # 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) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: fails if bubblewrap (bwrap) is installed + # "bwrap: setting up uid map: Permission denied" + # + # bytecomp-tests--dest-mountpoint + %lisp/emacs-lisp/bytecomp-tests.el + ) + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + src_install() { emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
