1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-07 15:21:46 +00:00
Commit Graph

92 Commits

Author SHA1 Message Date
Michael Albinus
cc6aebc85e Further Tramp instrumentation
; * test/infra/test-jobs.yml (test-lisp-net-inotify):
; Revert instrumentation.
2022-07-27 15:22:08 +02:00
Michael Albinus
e6b0fa4408 ; Instrument Tramp tests
; * test/infra/test-jobs.yml (test-lisp-net-inotify): Run expensive.
; * test/lisp/net/tramp-tests.el (tramp-test32-shell-command): Instrument.
2022-07-27 13:46:53 +02:00
Eli Zaretskii
823b6b8d26 ; Add 2022 to copyright years. 2022-01-01 07:07:15 -05: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
5b2ba7da4f ; Fix syntax error in generated test/infra/test-jobs.yml 2021-11-24 14:47:55 +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
88637c3415 Adapt artifacts paths in emba testjobs
* test/infra/Makefile.in (subdir_template): Adapt artifacts paths.

* test/infra/test-jobs.yml: Regenerate.
2021-11-23 16:25:41 +01:00
Michael Albinus
c3ac8285d4 ; Remove "needs" from emba jobs 2021-11-22 19:40:56 +01:00
Michael Albinus
d737bfe911 ; Fix error in artifacts paths of emba jobs 2021-11-22 16:47:23 +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
Michael Albinus
75d294cd4a Reorganize emba control files
Using dynamic job generation in GitLab does not work sufficiently.  So
we generate the jobs in the Emacs sources.

* configure.ac (SUBDIR_MAKEFILES): Add test/infra/Makefile.

* test/Makefile.in (subdirs, generate-test-jobs): New targets.

* test/infra/Makefile.in:
* test/infra/test-jobs.yml: New files.

* test/infra/default-gitlab-ci.yml:
* test/infra/test-jobs-generator.sh: Remove.

* test/infra/gitlab-ci.yml: Insert contents of default-gitlab-ci.yml.
(stages): Remove generator and trigger.  Add normal.
(test-jobs-generator, test-jobs-pipeline): Remove jobs.
(top): Include test-jobs.yml.
2021-11-21 14:39:29 +01:00
Michael Albinus
64fc94b11e * test/infra/test-jobs-generator.sh: Generate also stages entry. 2021-11-20 21:50:20 +01:00
Michael Albinus
33e994415d Revert last change on emba files 2021-11-20 20:05:52 +01:00
Michael Albinus
bfcc59371b ; Rearrange normal stage in emba files 2021-11-20 13:29:33 +01:00
Michael Albinus
5cb003c31c ; Rearrange include in emba scripts 2021-11-20 12:14:49 +01:00
Michael Albinus
9f06977782 Continue adaptions of emba files
* test/infra/default-gitlab-ci.yml: New file, derived from
gitlab-ci.yml.

* test/infra/gitlab-ci.yml (top, test-jobs-pipeline):
Include default-gitlab-ci.yml.
(stages): Remove normal.

* test/infra/test-jobs-generator.sh: Generate also stages entry.
2021-11-20 10:07:48 +01:00
Michael Albinus
54b2bd1be6 ; * test/infra/test-jobs-generator.sh: Still fixes. 2021-11-19 21:24:08 +01:00
Michael Albinus
0d9aa424f7 ; Fix emba scripts 2021-11-19 20:20:31 +01:00
Michael Albinus
b11e432085 ; Still gitlab-ci.yml fixes
* test/infra/gitlab-ci.yml (variables): Add CI_DEBUG_TRACE.
(build-image-inotify): Remove timeout.
(generator, test-jobs-pipeline): New jobs.
(test-lisp-inotify, test-lisp-net-inotify): Comment.
2021-11-19 17:54:59 +01:00
Michael Albinus
408577b402 ; Further fixes in gitlab-ci.yml 2021-11-19 17:46:40 +01:00
Michael Albinus
3e53047fc5 Fix stage in gitlab-ci.yml 2021-11-19 17:33:12 +01:00
Michael Albinus
cb612c51d6 Add more test jobs for emba
* test/Makefile.in (SUBDIRS): Suppress "*auto-save-list".
(SUBDIR_TARGETS): New variable.
(subdir_template): Set it.
(subdir-targets): New target.

* test/infra/gitlab-ci.yml (variables): Add CI_DEBUG_TRACE.
(build-image-inotify): Remove timeout.
(generator, test-jobs-pipeline): New jobs.
(test-lisp-inotify, test-lisp-net-inotify): Comment.

* test/infra/test-jobs-generator.sh: New script.
2021-11-19 16:50:03 +01:00
Michael Albinus
03fba4da8f Do not exclude emacs-module-tests.el on emba
* test/infra/gitlab-ci.yml (test-native-comp-speed0)
(test-all-inotify): Do not exclude emacs-module-tests.el.

* test/src/emacs-module-tests.el
(module--test-assertions--load-non-live-object)
(module--test-assertions--load-non-live-object-with-global-copy)
(module--test-assertions--call-emacs-from-gc)
(module--test-assertions--globref-invalid-free): Tag them as
:unstable on emba.  (Bug#50902)
2021-11-18 19:35:13 +01:00
Michael Albinus
aa90de71a2 Exclude emacs-module-tests.el on emba
* test/infra/gitlab-ci.yml (test-native-comp-speed0):
Exclude emacs-module-tests.el.
2021-11-01 16:00:06 +01: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
e6bbbd303f * test/infra/gitlab-ci.yml (build-image-inotify): Increase timeout.
(test-native-comp-speed0): Adapt make_params.
2021-10-26 18:52:39 +02:00
Michael Albinus
b2eb228b8d * test/infra/gitlab-ci.yml (variables, default): Increase timeout to 4 hours. 2021-10-23 13:23:25 +02: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
ffff168d5f Set EMACS_TEST_TIMEOUT for emba
* test/Makefile.in: Support EMACS_TEST_TIMEOUT environment variable.

* test/README: Mention EMACS_TEST_TIMEOUT environment variable.

* test/infra/gitlab-ci.yml (variables): Set default value of
EMACS_TEST_TIMEOUT.
(.job-template): Propagate EMACS_TEST_TIMEOUT and EMACS_TEST_VERBOSE.
(test-all-inotify): Set specific EMACS_TEST_TIMEOUT.
2021-10-16 18:08:25 +02:00
Michael Albinus
aa55dd61e1 ; Move timeout in gitlab-ci.yml 2021-10-15 16:10:53 +02:00
Michael Albinus
705b07660a ; Fix last change on gitlab-ci.yml 2021-10-15 14:15:28 +02:00
Michael Albinus
d8d71cef9e Further gitlab-ci.yml changes
* test/infra/gitlab-ci.yml (.job-template): Add --timeout.
(.test-template): Adapt artifact paths.
2021-10-15 11:01:55 +02:00
Michael Albinus
40f2010971 ; Instrument gitlab-ci.yml 2021-10-14 19:38:53 +02:00
Michael Albinus
2202f3f5fe Adapt gitlab-ci.yml paths
* test/infra/gitlab-ci.yml (.job-template): Increase timeout.
(.job-template, .build-template, .test-template)
(.gnustep-template, .filenotify-gio-template)
(.native-comp-template): Adapt paths.
2021-10-14 09:37:13 +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
ff31741b85 * admin/notes/emba (Emacs jobset): Update.
* test/infra/gitlab-ci.yml (.test-template): Uncomment
'allow_failure', it isn't needed anymore.
2021-10-06 12:24:45 +02:00
Michael Albinus
909f2a4b92 * test/infra/gitlab-ci.yml (test-native-comp-speed0): Fix thinko. 2021-10-04 13:19:38 +02:00
Michael Albinus
c6be44d9b3 * test/infra/gitlab-ci.yml (.native-comp-template): Revert change. 2021-10-03 19:53:17 +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