1 |
commit: 427c8f5fd8ca8a983673cdc20e867e0199ac478b |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 24 23:21:41 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 26 07:46:05 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427c8f5f |
7 |
|
8 |
app-editors/emacs: enable tests for >= 28.1.91-r1 |
9 |
|
10 |
Still skipping some tests but this is a start. |
11 |
|
12 |
They were originally disabled b/c of some issues |
13 |
where Mercurial was not installed, but I can't |
14 |
hit that now. |
15 |
|
16 |
For 29.x, one of the failing tests is |
17 |
already fixed (files-tests-file-name-non-special-file-in-directory-p). |
18 |
|
19 |
Bug: https://bugs.gentoo.org/663026 |
20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
21 |
Closes: https://github.com/gentoo/gentoo/pull/27008 |
22 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
23 |
|
24 |
app-editors/emacs/emacs-28.1.91-r1.ebuild | 54 ++++++++++++++++++++++++++++++- |
25 |
app-editors/emacs/emacs-28.1.9999.ebuild | 54 ++++++++++++++++++++++++++++++- |
26 |
app-editors/emacs/emacs-29.0.9999.ebuild | 48 ++++++++++++++++++++++++++- |
27 |
3 files changed, 153 insertions(+), 3 deletions(-) |
28 |
|
29 |
diff --git a/app-editors/emacs/emacs-28.1.91-r1.ebuild b/app-editors/emacs/emacs-28.1.91-r1.ebuild |
30 |
index f40d3160db81..de0ccc6dce2f 100644 |
31 |
--- a/app-editors/emacs/emacs-28.1.91-r1.ebuild |
32 |
+++ b/app-editors/emacs/emacs-28.1.91-r1.ebuild |
33 |
@@ -44,7 +44,6 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
34 |
|
35 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
36 |
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" |
37 |
-RESTRICT="test" |
38 |
|
39 |
RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
40 |
sys-libs/ncurses:0= |
41 |
@@ -177,6 +176,9 @@ src_prepare() { |
42 |
src_configure() { |
43 |
local myconf |
44 |
|
45 |
+ # Prevents e.g. tests interfering with running Emacs. |
46 |
+ unset EMACS_SOCKET_NAME |
47 |
+ |
48 |
if use alsa; then |
49 |
use sound || ewarn \ |
50 |
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support." |
51 |
@@ -317,6 +319,56 @@ src_compile() { |
52 |
emake |
53 |
} |
54 |
|
55 |
+src_test() { |
56 |
+ # List .el test files with a comment above listing the exact |
57 |
+ # subtests which caused failure. Elements should begin with a %. |
58 |
+ # e.g. %lisp/gnus/mml-sec-tests.el. |
59 |
+ local exclude_tests=( |
60 |
+ # Reason: not yet known |
61 |
+ # mml-secure-en-decrypt-{1,2,3,4} |
62 |
+ # mml-secure-find-usable-keys-{1,2} |
63 |
+ # mml-secure-key-checks |
64 |
+ # mml-secure-select-preferred-keys-4 |
65 |
+ # mml-secure-sign-verify-1 |
66 |
+ %lisp/gnus/mml-sec-tests.el |
67 |
+ |
68 |
+ # Reason: race condition |
69 |
+ # Looks like it should be fixed in 29.x at least: |
70 |
+ # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706 |
71 |
+ # files-tests-file-name-non-special-file-in-directory-p |
72 |
+ %lisp/files-tests.el |
73 |
+ |
74 |
+ # Reason: permission denied on /nonexistent |
75 |
+ # (vc-*-bzr only fails if breezy is installed, as they |
76 |
+ # try to access cache dirs under /nonexistent) |
77 |
+ # |
78 |
+ # rmail-undigest-test-multipart-mixed-digest |
79 |
+ # rmail-undigest-test-rfc1153-less-strict-digest |
80 |
+ # rmail-undigest-test-rfc1153-sloppy-digest |
81 |
+ # rmail-undigest-test-rfc934-digest |
82 |
+ # vc-test-bzr02-state |
83 |
+ # vc-test-bzr05-rename-file |
84 |
+ # vc-test-bzr06-version-diff |
85 |
+ # vc-bzr-test-bug9781 |
86 |
+ %lisp/mail/undigest-tests.el |
87 |
+ %lisp/vc/vc-tests.el |
88 |
+ %lisp/vc/vc-bzr-tests.el |
89 |
+ |
90 |
+ # Reason: fails if bubblewrap (bwrap) is installed |
91 |
+ # "bwrap: setting up uid map: Permission denied" |
92 |
+ # |
93 |
+ # bytecomp-tests--dest-mountpoint |
94 |
+ %lisp/emacs-lisp/bytecomp-tests.el |
95 |
+ ) |
96 |
+ |
97 |
+ # See test/README for possible options |
98 |
+ emake \ |
99 |
+ EMACS_TEST_VERBOSE=1 \ |
100 |
+ EXCLUDE_TESTS="${exclude_tests[*]}" \ |
101 |
+ TEST_BACKTRACE_LINE_LENGTH=nil \ |
102 |
+ check |
103 |
+} |
104 |
+ |
105 |
src_install() { |
106 |
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install |
107 |
|
108 |
|
109 |
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild |
110 |
index 9dde01902de3..8b050ba1f509 100644 |
111 |
--- a/app-editors/emacs/emacs-28.1.9999.ebuild |
112 |
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild |
113 |
@@ -41,7 +41,6 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
114 |
|
115 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
116 |
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" |
117 |
-RESTRICT="test" |
118 |
|
119 |
RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
120 |
sys-libs/ncurses:0= |
121 |
@@ -179,6 +178,9 @@ src_prepare() { |
122 |
src_configure() { |
123 |
local myconf |
124 |
|
125 |
+ # Prevents e.g. tests interfering with running Emacs. |
126 |
+ unset EMACS_SOCKET_NAME |
127 |
+ |
128 |
if use alsa; then |
129 |
use sound || ewarn \ |
130 |
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support." |
131 |
@@ -319,6 +321,56 @@ src_compile() { |
132 |
emake |
133 |
} |
134 |
|
135 |
+src_test() { |
136 |
+ # List .el test files with a comment above listing the exact |
137 |
+ # subtests which caused failure. Elements should begin with a %. |
138 |
+ # e.g. %lisp/gnus/mml-sec-tests.el. |
139 |
+ local exclude_tests=( |
140 |
+ # Reason: not yet known |
141 |
+ # mml-secure-en-decrypt-{1,2,3,4} |
142 |
+ # mml-secure-find-usable-keys-{1,2} |
143 |
+ # mml-secure-key-checks |
144 |
+ # mml-secure-select-preferred-keys-4 |
145 |
+ # mml-secure-sign-verify-1 |
146 |
+ %lisp/gnus/mml-sec-tests.el |
147 |
+ |
148 |
+ # Reason: race condition |
149 |
+ # Looks like it should be fixed in 29.x at least: |
150 |
+ # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706 |
151 |
+ # files-tests-file-name-non-special-file-in-directory-p |
152 |
+ %lisp/files-tests.el |
153 |
+ |
154 |
+ # Reason: permission denied on /nonexistent |
155 |
+ # (vc-*-bzr only fails if breezy is installed, as they |
156 |
+ # try to access cache dirs under /nonexistent) |
157 |
+ # |
158 |
+ # rmail-undigest-test-multipart-mixed-digest |
159 |
+ # rmail-undigest-test-rfc1153-less-strict-digest |
160 |
+ # rmail-undigest-test-rfc1153-sloppy-digest |
161 |
+ # rmail-undigest-test-rfc934-digest |
162 |
+ # vc-test-bzr02-state |
163 |
+ # vc-test-bzr05-rename-file |
164 |
+ # vc-test-bzr06-version-diff |
165 |
+ # vc-bzr-test-bug9781 |
166 |
+ %lisp/mail/undigest-tests.el |
167 |
+ %lisp/vc/vc-tests.el |
168 |
+ %lisp/vc/vc-bzr-tests.el |
169 |
+ |
170 |
+ # Reason: fails if bubblewrap (bwrap) is installed |
171 |
+ # "bwrap: setting up uid map: Permission denied" |
172 |
+ # |
173 |
+ # bytecomp-tests--dest-mountpoint |
174 |
+ %lisp/emacs-lisp/bytecomp-tests.el |
175 |
+ ) |
176 |
+ |
177 |
+ # See test/README for possible options |
178 |
+ emake \ |
179 |
+ EMACS_TEST_VERBOSE=1 \ |
180 |
+ EXCLUDE_TESTS="${exclude_tests[*]}" \ |
181 |
+ TEST_BACKTRACE_LINE_LENGTH=nil \ |
182 |
+ check |
183 |
+} |
184 |
+ |
185 |
src_install() { |
186 |
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install |
187 |
|
188 |
|
189 |
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild |
190 |
index c533ab2a5a6e..c88004a9780d 100644 |
191 |
--- a/app-editors/emacs/emacs-29.0.9999.ebuild |
192 |
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild |
193 |
@@ -41,7 +41,6 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
194 |
|
195 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
196 |
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" |
197 |
-RESTRICT="test" |
198 |
|
199 |
X_DEPEND="x11-libs/libICE |
200 |
x11-libs/libSM |
201 |
@@ -201,6 +200,9 @@ src_prepare() { |
202 |
src_configure() { |
203 |
local myconf |
204 |
|
205 |
+ # Prevents e.g. tests interfering with running Emacs. |
206 |
+ unset EMACS_SOCKET_NAME |
207 |
+ |
208 |
if use alsa; then |
209 |
use sound || ewarn \ |
210 |
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support." |
211 |
@@ -369,6 +371,50 @@ src_compile() { |
212 |
emake |
213 |
} |
214 |
|
215 |
+src_test() { |
216 |
+ # List .el test files with a comment above listing the exact |
217 |
+ # subtests which caused failure. Elements should begin with a %. |
218 |
+ # e.g. %lisp/gnus/mml-sec-tests.el. |
219 |
+ local exclude_tests=( |
220 |
+ # Reason: not yet known |
221 |
+ # mml-secure-en-decrypt-{1,2,3,4} |
222 |
+ # mml-secure-find-usable-keys-{1,2} |
223 |
+ # mml-secure-key-checks |
224 |
+ # mml-secure-select-preferred-keys-4 |
225 |
+ # mml-secure-sign-verify-1 |
226 |
+ %lisp/gnus/mml-sec-tests.el |
227 |
+ |
228 |
+ # Reason: permission denied on /nonexistent |
229 |
+ # (vc-*-bzr only fails if breezy is installed, as they |
230 |
+ # try to access cache dirs under /nonexistent) |
231 |
+ # |
232 |
+ # rmail-undigest-test-multipart-mixed-digest |
233 |
+ # rmail-undigest-test-rfc1153-less-strict-digest |
234 |
+ # rmail-undigest-test-rfc1153-sloppy-digest |
235 |
+ # rmail-undigest-test-rfc934-digest |
236 |
+ # vc-test-bzr02-state |
237 |
+ # vc-test-bzr05-rename-file |
238 |
+ # vc-test-bzr06-version-diff |
239 |
+ # vc-bzr-test-bug9781 |
240 |
+ %lisp/mail/undigest-tests.el |
241 |
+ %lisp/vc/vc-tests.el |
242 |
+ %lisp/vc/vc-bzr-tests.el |
243 |
+ |
244 |
+ # Reason: fails if bubblewrap (bwrap) is installed |
245 |
+ # "bwrap: setting up uid map: Permission denied" |
246 |
+ # |
247 |
+ # bytecomp-tests--dest-mountpoint |
248 |
+ %lisp/emacs-lisp/bytecomp-tests.el |
249 |
+ ) |
250 |
+ |
251 |
+ # See test/README for possible options |
252 |
+ emake \ |
253 |
+ EMACS_TEST_VERBOSE=1 \ |
254 |
+ EXCLUDE_TESTS="${exclude_tests[*]}" \ |
255 |
+ TEST_BACKTRACE_LINE_LENGTH=nil \ |
256 |
+ check |
257 |
+} |
258 |
+ |
259 |
src_install() { |
260 |
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install |