1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-01 05:10:54 -08:00
Commit graph

22 commits

Author SHA1 Message Date
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
2ce72d2e6e Adapt emba control files
* test/infra/Dockerfile.emba: Do not generate debug info.

* test/infra/gitlab-ci.yml (variables, default): Revert timeout
back to three hours.
(.job-template): Comment test prints.
(test-all-inotify): Exclude emacs-module-tests.el.
2021-10-31 17:45:39 +01:00
Michael Albinus
f7a2ff3bf5 Adapt some emba parameters
* test/infra/Dockerfile.emba (emacs-inotify): Reduce debug options.

* test/infra/gitlab-ci.yml (test-native-comp-speed0): Adapt make_params.
2021-10-22 15:02:34 +02:00
Michael Albinus
f3960bffd0 Configure Emacs on emba with debug options
* test/infra/Dockerfile.emba (emacs-base): Install gdb.
(emacs-inotify): Configure debug options.
2021-10-21 20:04:51 +02:00
Michael Albinus
e494a2d00a Continue to work on emba integration
* test/infra/Dockerfile.emba: Remove instrumentation.

* test/infra/gitlab-ci.yml (.job-template): Specify timeout signal.
(.job-template, .test-template): Improve wildcard.
2021-10-13 18:59:58 +02:00
Michael Albinus
83195c57e6 Adapt emba control files
* test/infra/Dockerfile.emba: Print core pattern.

* test/infra/gitlab-ci.yml (.job-template, .test-template):
Improve wildcard.
(.job-template): Add timeout.
2021-10-12 18:53:54 +02:00
Michael Albinus
9d77dea374 Improve native compilation on emba
* test/infra/Dockerfile.emba (emacs-native-comp)
(emacs-native-comp-speed1, emacs-native-comp-speed2): New stages.
(emacs-native-comp-speed0): Adapt.

* test/infra/gitlab-ci.yml (.build-template): Add 'needs: []'.
(.native-comp-template): Use 'only:' instead of 'rules:'.
(build-native-comp-speed0): Rename from 'build-native-bootstrap-speed0'.
(build-native-comp-speed1, build-native-comp-speed2)
(test-native-comp-speed0): New jobs.
2021-10-03 19:40:14 +02:00
Michael Albinus
bd3a1c3134 ; Still working on emba CI
* test/infra/Dockerfile.emba (emacs-base): Install also acl.

* test/infra/gitlab-ci.yml (.test-template): Move 'allow_failure'
clause level up.
2021-09-30 18:28:31 +02:00
Michael Albinus
0d72beec9b Some inmprovements in emba CI files
* test/infra/Dockerfile.emba: Remove superfluous "make -j4".

* test/infra/gitlab-ci.yml (.test-template): Add 'allow_failure' clause.
(test-all-inotify): Add 'needs' clause.
2021-09-29 09:48:01 +02:00
Michael Albinus
2cef8c216a Optimize emba builds
* test/infra/Dockerfile.emba (emacs-base): Install also
libdbus-1-dev and libacl1-dev.

* test/infra/gitlab-ci.yml (prep-image-base): Comment out.  This
stage is activated by default in Dockerfile.emba.
2021-09-27 09:21:53 +02:00
Michael Albinus
de7b9e31c4 * test/infra/Dockerfile.emba: Do not run 'make -j4 bootstrap'. 2021-09-23 16:04:35 +02:00
Clément Pit-Claudel
9117a76b53 Change --with-nativecomp to --with-native-compilation in messages
* configure.ac:
* test/infra/Dockerfile.emba:
* test/infra/gitlab-ci.yml: Fix mentions of --with-nativecomp
(bug#50255).
2021-08-29 21:32:01 +02:00
Michael Albinus
92464bd9b7 Rearrange nativecomp tests for EMBA
* test/infra/Dockerfile.emba (emacs-native-comp-speed0):
Add recipe.

* test/infra/gitlab-ci.yml (stages): New stages native-comp-images
and native-comp.
(build-native-bootstrap-speed0): Simplify.
(build-native-bootstrap-speed1, build-native-bootstrap-speed2):
Deactivate temporarily.
2021-05-21 09:43:04 +02:00
Michael Albinus
6060d53b3e * test/infra/Dockerfile.emba (emacs-gnustep): Do not run parallel make. 2021-04-05 12:45:10 +02:00
Michael Albinus
d6344b2e9a Keep *.log files on emba
* test/infra/gitlab-ci.yml (.test-template): New template.
(test-fast-inotify, test-lisp-inotify, test-lisp-net-inotify)
(test-filenotify-gio, test-gnustep, test-all-inotify): Use it.
2021-03-27 11:43:15 +01:00
Michael Albinus
c1f4a16cf3 * test/infra/Dockerfile.emba: Install texinfo. 2021-03-07 18:55:44 +01:00
Michael Albinus
564b6391f8 ; * test/infra/Dockerfile.emba: Fix last change. 2021-03-07 11:43:27 +01:00
Michael Albinus
30489f4264 * test/infra/Dockerfile.emba: Touch "info/emacs". 2021-03-07 11:36:38 +01:00
Michael Albinus
83fa649e02 Adapt Dockerfile.emba according to recent configure changes
* test/infra/Dockerfile.emba: Remove "--without-makeinfo" from
configure.  Add "lisp" to make.
2021-03-07 10:44:12 +01:00
Ted Zlatanov
84e0749b8b
EMBA container build improvements for Emacs build testing.
* test/infra/gitlab-ci.yml: Moved from .gitlab-ci.yml. Use the
EMBA container registry with a different login token storage file
for each commit. Split test stages into prep, build, fast tests,
normal tests, platform tests, and slow (everything) and use
templates where possible.

* .gitlab-ci.yml: Include test/infra/gitlab-ci.yml and move all
content there.
2021-01-16 13:05:38 +00:00
Ted Zlatanov
707ee6afe2
EMBA infrastructure improvements for Emacs build testing.
* .gitlab-ci.yml: Use job templates and rules. Split tests into
fast/normal/slow. Make Docker images for each tested platform
(inotify, filenotify-gio, gnustep). Increase timeout.
* test/Makefile.in (check-lisp, check-net): Add new testing
targets.
* test/README: Document them.
* test/file-organization.org: Mention test/infra.
* test/infra/Dockerfile.emba: Add special Docker recipes for EMBA
testing.
2021-01-14 14:22:29 +00:00