Commit graph

113 commits

Author SHA1 Message Date
Paul Eggert
4da38c6321 Update copyright year to 2025
Run "TZ=UTC0 admin/update-copyright".
2025-01-01 07:39:17 +00:00
Michael Albinus
19f929aaa3 Adapt gitlab-ci.yml
* test/infra/gitlab-ci.yml (variables): Set GIT_DEPTH: 0.
(.job-template): Remove cache:policy.
(.build-template): Add needs and cache:policy.
(.test-template): Add cache:policy.
(.tree-sitter-template): Add files in changes.
2024-10-13 15:40:42 +02:00
Michael Albinus
042eee61ee ; Fix last change in gitlab-ci.yml 2024-10-03 16:41:40 +02:00
Michael Albinus
748f76c5b3 ; Minor changes in gitlab-ci.yml
* test/infra/gitlab-ci.yml (.job-template): Comment test prints.
(.test-template): Adapt paths:
2024-10-03 09:26:24 +02:00
Michael Albinus
39ac8ddafd * test/infra/gitlab-ci.yml (.tree-sitter-template): Add treesit.el. 2024-09-21 10:22:41 +02:00
Michael Albinus
1f4da7fe3e ; Still fighting with emba.gnu.org config
* test/infra/gitlab-ci.yml (variables): Remove GIT_DEPTH.
(.job-template): Set cache:policy to pull-push, as before.  Check
behavior of docker export.
(.build-template): Remove needs and cache.
(.test-template): Remove cache.  Adapt artifacts:paths.
2024-08-25 12:18:01 +02:00
Michael Albinus
3f019167b8 Suppress shallow cloning on emba
* test/infra/gitlab-ci.yml (variables): Set GIT_DEPTH to 0 in
order to avoid shallow cloning.
2024-08-20 19:23:48 +02:00
Michael Albinus
55337dc36a * test/infra/gitlab-ci.yml (.tree-sitter-template): Adapt changes. 2024-08-18 11:29:05 +02:00
Michael Albinus
7c588a0065 ; Backport gitlab-ci.yml from master (don't merge)
* test/infra/gitlab-ci.yml (.job-template): Remove cache:policy.
(.build-template, .test-template): Add job specific cache:policy.
(.tree-sitter-template): Adapt changes.
2024-08-14 09:47:59 +02:00
Michael Albinus
ce4f56caf7 Extend treesitter tests on emba
* test/infra/Dockerfile.emba (emacs-tree-sitter): Install c-ashrp
grammar.

* test/infra/Makefile.in (TREE-SITTER-FILES): Add csharp-mode-tests.el.
(tree-sitter-files): Rename from tree-sitter-files-template.
Generate .tree-sitter-files.

* test/infra/gitlab-ci.yml (test-tree-sitter): Extend .tree-sitter-files.

* test/infra/test-jobs.yml: Regenerate.
2024-06-24 20:02:07 +02:00
Michael Albinus
d844521abd Improve treesitter tests on EMBA
* test/infra/Makefile.in (subdir_template):
* test/infra/gitlab-ci.yml (.tree-sitter-template): Check also
textmodes subdirectory for treesitter files.

* test/infra/test-jobs.yml: Regenerate.
2024-04-30 09:25:53 +02:00
Michael Albinus
4a27b31c46 Some EMBA integration fixes
* test/infra/Dockerfile.emba (emacs-native-comp-speed2): Fix typo.

* test/infra/gitlab-ci.yml (.job-template): Add configure.log to
artifacts.
2024-04-23 13:24:09 +02:00
Michael Albinus
6f810459d8 ; Fix last commit
* test/infra/Makefile.in:
* test/infra/gitlab-ci.yml:
* test/infra/test-jobs.yml: Do not quote make_params.
2024-04-22 16:54:07 +02:00
Michael Albinus
42c8e2dfce Rework EMBA integration
* test/infra/Dockerfile.emba (emacs-inotify, emacs-filenotify-gio)
(emacs-eglot, emacs-tree-sitter, emacs-gnustep)
(emacs-native-comp-speed0, emacs-native-comp-speed1)
(emacs-native-comp-speed2): Use "-j `nproc`".
(emacs-eglot): Add libxml2-dev and node-typescript.
(emacs-tree-sitter) Add libxml2-dev and tree-sitter-rust.

* test/infra/Makefile.in (subdir_template): Simplify make_params.

* test/infra/gitlab-ci.yml (.job-template): Set environment
variable NPROC.  Use "-k -j \$NPROC".
(test-filenotify-gio, test-eglot, test-tree-sitter)
(test-native-comp-speed2): Simplify make_params.

* test/infra/test-jobs.yml: Regenerate.
2024-04-22 13:38:10 +02:00
Michael Albinus
21e33567fa gitlab-ci.yml adaptions
* test/infra/gitlab-ci.yml (test-filenotify-gio, test-eglot):
Add TEST_HOME.
(test-tree-sitter): Extend SELECTOR.
2024-04-20 17:49:28 +02:00
Michael Albinus
b47b8159d8 Adapt tree-sitter job on EMBA
* test/infra/gitlab-ci.yml (.tree-sitter-template)
(test-tree-sitter): Adapt tree-sitter job.
2024-04-16 10:55:37 +02:00
Po Lu
ecf08f0621 Merge from savannah/emacs-29
dc4e6b1329 ; Update copyright years in more files
64b3777631 ; Run set-copyright from admin.el
8e1c56ae46 ; Add 2024 to copyright years

# Conflicts:
#	doc/misc/modus-themes.org
#	doc/misc/texinfo.tex
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
#	etc/themes/modus-operandi-theme.el
#	etc/themes/modus-themes.el
#	etc/themes/modus-vivendi-theme.el
#	lib/alloca.in.h
#	lib/binary-io.h
#	lib/c-ctype.h
#	lib/c-strcasecmp.c
#	lib/c-strncasecmp.c
#	lib/careadlinkat.c
#	lib/cloexec.c
#	lib/close-stream.c
#	lib/diffseq.h
#	lib/dup2.c
#	lib/filemode.h
#	lib/fpending.c
#	lib/fpending.h
#	lib/fsusage.c
#	lib/getgroups.c
#	lib/getloadavg.c
#	lib/gettext.h
#	lib/gettime.c
#	lib/gettimeofday.c
#	lib/group-member.c
#	lib/malloc.c
#	lib/md5-stream.c
#	lib/md5.c
#	lib/md5.h
#	lib/memmem.c
#	lib/memrchr.c
#	lib/nanosleep.c
#	lib/save-cwd.h
#	lib/sha1.c
#	lib/sig2str.c
#	lib/stdlib.in.h
#	lib/strtoimax.c
#	lib/strtol.c
#	lib/strtoll.c
#	lib/time_r.c
#	lib/xalloc-oversized.h
#	lisp/auth-source-pass.el
#	lisp/emacs-lisp/lisp-mnt.el
#	lisp/emacs-lisp/timer.el
#	lisp/info-look.el
#	lisp/jit-lock.el
#	lisp/loadhist.el
#	lisp/mail/rmail.el
#	lisp/net/ntlm.el
#	lisp/net/webjump.el
#	lisp/progmodes/asm-mode.el
#	lisp/progmodes/project.el
#	lisp/progmodes/sh-script.el
#	lisp/textmodes/flyspell.el
#	lisp/textmodes/reftex-toc.el
#	lisp/textmodes/reftex.el
#	lisp/textmodes/tex-mode.el
#	lisp/url/url-gw.el
#	m4/alloca.m4
#	m4/clock_time.m4
#	m4/d-type.m4
#	m4/dirent_h.m4
#	m4/dup2.m4
#	m4/euidaccess.m4
#	m4/fchmodat.m4
#	m4/filemode.m4
#	m4/fsusage.m4
#	m4/getgroups.m4
#	m4/getloadavg.m4
#	m4/getrandom.m4
#	m4/gettime.m4
#	m4/gettimeofday.m4
#	m4/gnulib-common.m4
#	m4/group-member.m4
#	m4/inttypes.m4
#	m4/malloc.m4
#	m4/manywarnings.m4
#	m4/mempcpy.m4
#	m4/memrchr.m4
#	m4/mkostemp.m4
#	m4/mktime.m4
#	m4/nproc.m4
#	m4/nstrftime.m4
#	m4/pathmax.m4
#	m4/pipe2.m4
#	m4/pselect.m4
#	m4/pthread_sigmask.m4
#	m4/readlink.m4
#	m4/realloc.m4
#	m4/sig2str.m4
#	m4/ssize_t.m4
#	m4/stat-time.m4
#	m4/stddef_h.m4
#	m4/stdint.m4
#	m4/stdio_h.m4
#	m4/stdlib_h.m4
#	m4/stpcpy.m4
#	m4/strnlen.m4
#	m4/strtoimax.m4
#	m4/strtoll.m4
#	m4/time_h.m4
#	m4/timegm.m4
#	m4/timer_time.m4
#	m4/timespec.m4
#	m4/unistd_h.m4
#	m4/warnings.m4
#	nt/configure.bat
#	nt/preprep.c
#	test/lisp/register-tests.el
2024-01-02 10:28:14 +08:00
Po Lu
8e1c56ae46 ; Add 2024 to copyright years 2024-01-02 09:47:10 +08:00
Michael Albinus
dfcc9a0f4d * test/infra/gitlab-ci.yml (.native-comp-template): Adapt "changes". 2023-11-10 11:16:22 +01:00
Michael Albinus
26ee0ce6f9 Adapt emba integration
* test/infra/Dockerfile.emba (emacs-tree-sitter):
Use "/root/.emacs.d/tree-sitter" instead of "/usr/local/lib/tree-sitter".

* test/infra/gitlab-ci.yml (.job-template): Run "/bin/bash -xvc".
(test-eglot): Revert last change, it doesn't work yet.
(test-tree-sitter): Set TEST_HOME instead of LD_LIBRARY_PATH.
2023-06-05 13:29:21 +02:00
Michael Albinus
6847c01568 Adapt emba integration
* test/infra/Dockerfile.emba (emacs-eglot, emacs-tree-sitter):
Don't install gawk.

* test/infra/gitlab-ci.yml (test-eglot): Add company and yasnippet.
2023-06-03 18:32:29 +02:00
Michael Albinus
f1fd3d2606 Adapt emba integration
* admin/notes/emba: Improve docker call.

* test/infra/Dockerfile.emba (emacs-eglot, emacs-tree-sitter):
Install also gawk.

* test/infra/Makefile.in (TREE-SITTER-FILES): New variable.
(tree-sitter-files-template): New rule.
(.PHONY, generate-test-jobs): Add it to dependencies.

* test/infra/gitlab-ci.yml (variables): Disable CI_DEBUG_TRACE.
(test-tree-sitter): Extends also .tree-sitter-files-template.  Use
$tree_sitter_files.

* test/infra/test-jobs.yml: Regenerate.
2023-06-03 10:19:02 +02:00
Michael Albinus
f947a0219b Fix tree-sitter tests on emba
* test/infra/Makefile.in: Revert tree-sitter relevant changes.

* test/infra/gitlab-ci.yml (test-tree-sitter): Remove
.tree-sitter-files-template.  List files explicitly.

* test/infra/test-jobs.yml: Regenerate.
2023-06-02 13:44:00 +02:00
Michael Albinus
f8c3d3824d ; * test/infra/gitlab-ci.yml (variables): Enable CI_DEBUG_TRACE. 2023-06-01 08:47:18 +02:00
Michael Albinus
3e3c277870 Improve tree-sitter tests on emba
* test/infra/Dockerfile.emba (emacs-tree-sitter): Install only
grammars which are needed.

* test/infra/Makefile.in (subdir_template): Special handling of
progmodes.
(TREE-SITTER-FILES): New variable.
(tree-sitter-files-template): New rule.
(.PHONY, generate-test-jobs): Add it to dependencies.

* test/infra/gitlab-ci.yml (.tree-sitter-template):
Add test/lisp/progmodes/*-ts-mode-resources/**.
(test-tree-sitter): Extends also .tree-sitter-files-template.  Use
$tree-sitter-files.

* test/infra/test-jobs.yml: Regenerate.
2023-05-31 08:44:44 +02:00
Michael Albinus
f8a79c0055 * test/infra/gitlab-ci.yml (test-tree-sitter): Fix file list. 2023-05-30 09:46:46 +02:00
Michael Albinus
edcdb4c2ec Add tree-sitter tests to emba
* admin/notes/emba: Add docker image emacs-tree-sitter.  Improve
docker call.

* test/infra/Dockerfile.emba (emacs-tree-sitter): New image.

* test/infra/gitlab-ci.yml (.tree-sitter-template): New template.
(build-image-tree-sitter, test-tree-sitter): New jobs.
2023-05-29 17:26:46 +02:00
Michael Albinus
257090b872 Adapt EMBA scripts.
* test/infra/Dockerfile.emba (emacs-gnustep): Add zlib1g-dev.
Remove make instrumentation.

* test/infra/gitlab-ci.yml (build-image-gnustep, test-gnustep): Uncomment.
2023-04-04 20:01:19 +02:00
Michael Albinus
db308233cb Comment out GNUSTEP jobs on EMBA (again)
* test/infra/gitlab-ci.yml (build-image-gnustep, test-gnustep):
Comment out jobs due to bug#62210.
2023-04-04 13:00:51 +02:00
Stefan Monnier
47bce04e87 Merge from origin/emacs-29
0337131bfa Update to Transient v0.3.7-218-g3dbb22a
a8c23677d3 Update to Org 9.6.2
45b16bfb49 Skip failing tests on Cygwin with native compilation (bug...
8b4a494d8d Fix GNUSTEP tests on EMBA

# Conflicts:
#	test/infra/gitlab-ci.yml
2023-03-27 17:16:59 -04:00
Michael Albinus
8b4a494d8d Fix GNUSTEP tests on EMBA
* configure.ac (LIBS_GNUSTEP): Adapt CPPFLAGS and CFLAGS.  (Bug#62210)
Proposed by Po Lu <luangruo@yahoo.com>.

* test/infra/gitlab-ci.yml (build-image-gnustep)
(test-gnustep): Uncomment jobs.
2023-03-26 14:20:05 +02:00
Stefan Kangas
90dca0a533 Merge from origin/emacs-29
6de00e4df9 ; Fix xref-match's :version since the default value did c...
db355b420b Use libgccjit-10-dev on EMBA
8496395653 * lisp/outline.el (outline--fix-buttons-after-change): Ad...
3d3bbaace6 Align concatenated strings to the first sibling in c-ts-mode
f856468e45 Only fill the current paragraph in c-ts-common--fill-bloc...
df669c5a11 Add missing indent rule for c-ts-mode
2023-03-23 06:30:13 +01:00
Michael Albinus
db355b420b Use libgccjit-10-dev on EMBA
* test/infra/Dockerfile.emba (emacs-native-comp): Use
libgccjit-10-dev.  (Bug#62211)

* test/infra/gitlab-ci.yml (build-native-comp-speed2)
(test-native-comp-speed2): Uncomment jobs.
2023-03-22 18:34:23 +01:00
Michael Albinus
5fbda320fc Add platform for Eglot tests on EMBA
* test/infra/Dockerfile.emba (emacs-eglot): New image.

* test/infra/gitlab-ci.yml (.eglot-template): New template.
(build-image-eglot, test-eglot): New jobs.
2023-03-22 15:00:15 +01:00
Michael Albinus
786de66ec3 Comment out jobs on EMBA
* test/infra/gitlab-ci.yml: Comment out jobs due to bug#62210 and
bug#62211.
2023-03-20 10:06:05 +01:00
Eli Zaretskii
cae528457c ; Add 2023 to copyright years. 2023-01-01 05:31:12 -05:00
Andrea Corallo
fa36b5ddf5 Backport: Enable native speed 2 EMBA build and tests and disable speed 0
* test/infra/gitlab-ci.yml (build-native-comp-speed2): Uncomment.
	(build-native-comp-speed0): Comment.
	(test-native-comp-speed0): Remove.
	(test-native-comp-speed2): Add.

(cherry picked from commit 06bf218f69)
2022-12-09 16:10:08 +01:00
Michael Albinus
d58d1dd48a Do not run slow tests on EMBA
* test/infra/gitlab-ci.yml (.filenotify-gio-template): Do not run
scheduled.
(build-native-comp-speed1, build-native-comp-speed2): Comment out.

* test/lisp/international/ucs-normalize-tests.el
(ucs-normalize-part1): Skip also on EMBA.
2022-12-06 12:36:15 +01:00
Eli Zaretskii
dcd76bd48d Merge from origin/emacs-28
836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year
ebe8772f65 ; Minor fixes related to copyright years
23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
19dcb237b5 ; Add 2022 to copyright years.

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
#	lib/cdefs.h
#	lisp/erc/erc-dcc.el
#	lisp/erc/erc-imenu.el
#	lisp/erc/erc-replace.el
#	lisp/image-dired.el
#	lisp/progmodes/xref.el
#	m4/alloca.m4
#	m4/byteswap.m4
#	m4/errno_h.m4
#	m4/getopt.m4
#	m4/gnulib-common.m4
#	m4/inttypes.m4
#	m4/stddef_h.m4
#	m4/stdint.m4
#	m4/sys_socket_h.m4
2022-01-01 07:03:03 -05:00
Eli Zaretskii
19dcb237b5 ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
Michael Albinus
55f652c856 Make generation of JUnit test reports more robust.
* lisp/emacs-lisp/ert.el (ert-load-file-name): New defvar.
(ert-write-junit-test-report): Use it.  Make detection of selector
more robust.  Protect calls of `xml-escape-string' with 'noerror.

* test/infra/Makefile.in (subdir_template): Use "make -k ...".

* test/infra/gitlab-ci.yml (test-filenotify-gio):
Adapt make_params in order to get a JUnit test report.
(test-native-comp-speed0): Use "make -k ...".

* test/infra/test-jobs.yml: Regenerate.

* test/lisp/progmodes/perl-mode-tests.el (top):
Set `ert-load-file-name'.
2021-12-18 18:43:18 +01:00
Michael Albinus
b30b33ed9b ERT can generate JUnit test reports
* .gitignore: Add test/**/*.xml.

* admin/notes/emba: Mention JUnit test report.

* etc/NEWS: ERT can generate JUnit test reports.

* lisp/emacs-lisp/ert.el (xml-escape-string): Autoload.
(ert-write-junit-test-report)
(ert-write-junit-test-summary-report): New defuns.
(ert-run-tests-batch, ert-summarize-tests-batch-and-exit): Call them.

* test/Makefile.in (clean): Remove *.xml.

* test/README: Mention $EMACS_TEST_JUNIT_REPORT environment variable.

* test/infra/Makefile.in ($(FILE)): Generate header commentary.
(clean): Remove.

* test/infra/gitlab-ci.yml (variables): Set EMACS_TEST_JUNIT_REPORT.
(.job-template): Use it in script and after_script.
(.build-template, .gnustep-template, .filenotify-gio-template)
(.native-comp-template): Adapt rules.
(.test-template): Trigger JUnit test report.

* test/infra/test-jobs.yml: Regenerate.
2021-12-13 16:09:56 +01:00
Michael Albinus
708ffac5ea * test/infra/gitlab-ci.yml (.job-template): Modify find scripts. 2021-11-29 21:36:51 +01:00
Michael Albinus
58128f9b05 ; Use /usr/bin/find in gitlab-ci.yml 2021-11-28 17:05:32 +01:00
Michael Albinus
1272a2cb63 Adapt gitlab-ci.yml
* test/infra/gitlab-ci.yml (variables): Set EMACS_TEST_TIMEOUT to 3600.
(.job-template, .test-template): Another approach to catch test
artifacts on emba.
2021-11-28 13:45:43 +01:00
Michael Albinus
338f780237 Simplify use of artifacts in emba files
* test/infra/gitlab-ci.yml (.test-template): Re-insert.
(test-all-inotify, test-filenotify-gio, test-gnustep)
(test-native-comp-speed0):
* test/infra/Makefile.in (subdir_template): Use it when
appropriate.  Remove artifacts.

* test/infra/test-jobs.yml: Regenerate.
2021-11-27 16:53:05 +01:00
Michael Albinus
051e49fe3c Adapt test/infra/gitlab-ci.yml
* test/infra/gitlab-ci.yml (test-all-inotify)
(test-filenotify-gio, test-gnustep, test-native-comp-speed0):
Add or adapt artifacts.
2021-11-26 15:41:22 +01:00
Michael Albinus
39e2c214df Some optimizations for emba jobs
* test/infra/gitlab-ci.yml (.test-template): Remove.
(test-all-inotify, test-filenotify-gio, test-gnustep)
(test-native-comp-speed0):
* test/infra/Makefile.in (subdir_template): Remove .test-template
from extends.  Add or adapt needs and artifacts.

* test/infra/test-jobs.yml: Regenerate.
2021-11-24 20:27:34 +01:00
Michael Albinus
7878c7f596 * admin/notes/emba (Emacs jobset): Remove stage slow.
* test/infra/Makefile.in (subdir_template): Add rule.

* test/infra/gitlab-ci.yml (.job-template): Remove changes section.
(.build-template, .gnustep-template, .filenotify-gio-template):
(.native-comp-template): Adapt changes section.
(.test-template): Add needs.  Adapt artifacts paths.
(stages): Remove slow.
(test-all-inotify): Move up.  Change stage to normal.  Remove timeout.
(test-filenotify-gio, test-gnustep, test-native-comp-speed0):
Move needs up.

* test/infra/test-jobs.yml: Regenerate.
2021-11-24 13:43:32 +01:00
Michael Albinus
196196c739 Adapt emba jobs
* admin/notes/emba (Emacs jobset): Precise.

* test/infra/Makefile.in (tn): New variable.
(subdir_template): Use it.  Handle eieio-tests, faceup-tests and
so-long-tests.  Rearrange .PHONY entry.  Add needs and artifacts
to emba job.

* test/infra/gitlab-ci.yml (test-filenotify-gio): Move up.

* test/infra/test-jobs.yml: Regenerate.
2021-11-22 16:33:16 +01:00